mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Joe Perches <joe@perches.com>
To: Linus Torvalds <torvalds@linux-foundation.org>,
	linux-kernel@vger.kernel.org
Cc: Andrew Morton <akpm@linux-foundation.org>, Kay Sievers <kay@vrfy.org>
Subject: [PATCH 2/8] printk: Add kern_levels.h to make KERN_<LEVEL> available for asm use
Date: Tue,  5 Jun 2012 02:46:31 -0700	[thread overview]
Message-ID: <75e80acc2f5fb5b779f03ee44ec2e1331daeede6.1338889066.git.joe@perches.com> (raw)
In-Reply-To: <cover.1338889066.git.joe@perches.com>

Separate the printk.h file into 2 pieces so the definitions
can be used in asm files.

Signed-off-by: Joe Perches <joe@perches.com>
---
 include/linux/kern_levels.h |   22 ++++++++++++++++++++++
 include/linux/printk.h      |   19 +------------------
 2 files changed, 23 insertions(+), 18 deletions(-)
 create mode 100644 include/linux/kern_levels.h

diff --git a/include/linux/kern_levels.h b/include/linux/kern_levels.h
new file mode 100644
index 0000000..337e56f
--- /dev/null
+++ b/include/linux/kern_levels.h
@@ -0,0 +1,22 @@
+#ifndef __KERN_LEVELS_H__
+#define __KERN_LEVELS_H__
+
+#define KERN_EMERG	"<0>"	/* system is unusable			*/
+#define KERN_ALERT	"<1>"	/* action must be taken immediately	*/
+#define KERN_CRIT	"<2>"	/* critical conditions			*/
+#define KERN_ERR	"<3>"	/* error conditions			*/
+#define KERN_WARNING	"<4>"	/* warning conditions			*/
+#define KERN_NOTICE	"<5>"	/* normal but significant condition	*/
+#define KERN_INFO	"<6>"	/* informational			*/
+#define KERN_DEBUG	"<7>"	/* debug-level messages			*/
+
+/* Use the default kernel loglevel */
+#define KERN_DEFAULT	"<d>"
+/*
+ * Annotation for a "continued" line of log printout (only done after a
+ * line that had no enclosing \n). Only to be used by core/arch code
+ * during early bootup (a continued line is not SMP-safe otherwise).
+ */
+#define KERN_CONT	"<c>"
+
+#endif
diff --git a/include/linux/printk.h b/include/linux/printk.h
index 6e12e1f..fea2de3 100644
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
@@ -2,28 +2,11 @@
 #define __KERNEL_PRINTK__
 
 #include <linux/init.h>
+#include <linux/kern_levels.h>
 
 extern const char linux_banner[];
 extern const char linux_proc_banner[];
 
-#define KERN_EMERG	"<0>"	/* system is unusable			*/
-#define KERN_ALERT	"<1>"	/* action must be taken immediately	*/
-#define KERN_CRIT	"<2>"	/* critical conditions			*/
-#define KERN_ERR	"<3>"	/* error conditions			*/
-#define KERN_WARNING	"<4>"	/* warning conditions			*/
-#define KERN_NOTICE	"<5>"	/* normal but significant condition	*/
-#define KERN_INFO	"<6>"	/* informational			*/
-#define KERN_DEBUG	"<7>"	/* debug-level messages			*/
-
-/* Use the default kernel loglevel */
-#define KERN_DEFAULT	"<d>"
-/*
- * Annotation for a "continued" line of log printout (only done after a
- * line that had no enclosing \n). Only to be used by core/arch code
- * during early bootup (a continued line is not SMP-safe otherwise).
- */
-#define KERN_CONT	"<c>"
-
 static inline int printk_get_level(const char *buffer)
 {
 	if (buffer[0] == '<' && buffer[1] && buffer[2] == '>') {
-- 
1.7.8.111.gad25c.dirty


  parent reply	other threads:[~2012-06-05  9:47 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-05  9:46 [PATCH 0/8] Rework KERN_<LEVEL> Joe Perches
2012-06-05  9:46 ` [PATCH 1/8] printk: Add generic functions to find KERN_<LEVEL> headers Joe Perches
2012-06-05  9:46 ` Joe Perches [this message]
2012-06-05  9:46 ` [PATCH 3/8] arch: Remove direct definitions of KERN_<LEVEL> uses Joe Perches
2012-06-05  9:46 ` [PATCH 4/8] btrfs: Use printk_get_level and printk_skip_level, add __printf, fix fallout Joe Perches
2012-06-05  9:46 ` [PATCH 5/8] sound: Use printk_get_level and printk_skip_level Joe Perches
2012-06-05  9:46 ` [PATCH 6/8] staging: wlags49_h2: Remove direct declarations of KERN_<LEVEL> prefixes Joe Perches
2012-06-05  9:46 ` [PATCH 7/8] printk: Convert the format for KERN_<LEVEL> to a 2 byte pattern Joe Perches
2012-06-05  9:46 ` [PATCH 8/8] printk: Remove the now unnecessary "C" annotation for KERN_CONT Joe Perches
2012-06-05 21:28 ` [PATCH 0/8] Rework KERN_<LEVEL> Andrew Morton
2012-06-05 21:53   ` Kay Sievers
2012-06-05 22:11   ` Joe Perches
2012-06-05 22:17     ` Andrew Morton
2012-06-05 22:49       ` Joe Perches
2012-06-05 23:29         ` Andrew Morton
2012-06-05 23:35           ` Joe Perches
2012-06-05 23:39             ` Kay Sievers
2012-06-05 23:43               ` Joe Perches
2012-06-05 23:48                 ` Kay Sievers
2012-06-05 23:52                   ` Joe Perches
2012-06-05 23:58                     ` Andrew Morton
2012-06-06  0:07                       ` Joe Perches
2012-06-06  0:13                         ` Kay Sievers
2012-06-06  0:19                           ` Joe Perches
2012-06-06  0:28                             ` Kay Sievers
2012-06-06  0:37                               ` Joe Perches
2012-06-06  0:37                               ` Andrew Morton
2012-06-06  0:40                                 ` Joe Perches
2012-06-06  0:46                                   ` Andrew Morton
2012-06-06  1:10                                     ` Kay Sievers
2012-06-06  2:06                                       ` Joe Perches
2012-06-06  3:04                                       ` [PATCH 9/8] printk: Only look for prefix levels in kernel messages Joe Perches
2012-06-05 23:48               ` [PATCH 0/8] Rework KERN_<LEVEL> Joe Perches
2012-06-05 22:55   ` Kay Sievers
2012-06-05 23:09     ` Andrew Morton

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=75e80acc2f5fb5b779f03ee44ec2e1331daeede6.1338889066.git.joe@perches.com \
    --to=joe@perches.com \
    --cc=akpm@linux-foundation.org \
    --cc=kay@vrfy.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®