aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2012-07-30 17:40:11 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-07-30 20:25:13 -0400
commit314ba3520e513a78be80e8c2ddbd65c91e78a114 (patch)
treebf47c5ca6f3c29b2fc9339444ada24bca118ede1
parentacc8fa41ad31c576cdbc569cc3e0e443b1b98b44 (diff)
printk: add kern_levels.h to make KERN_<LEVEL> available for asm use
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> Cc: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/linux/kern_levels.h22
-rw-r--r--include/linux/printk.h19
2 files changed, 23 insertions, 18 deletions
diff --git a/include/linux/kern_levels.h b/include/linux/kern_levels.h
new file mode 100644
index 00000000000..337e56ff533
--- /dev/null
+++ b/include/linux/kern_levels.h
@@ -0,0 +1,22 @@
1#ifndef __KERN_LEVELS_H__
2#define __KERN_LEVELS_H__
3
4#define KERN_EMERG "<0>" /* system is unusable */
5#define KERN_ALERT "<1>" /* action must be taken immediately */
6#define KERN_CRIT "<2>" /* critical conditions */
7#define KERN_ERR "<3>" /* error conditions */
8#define KERN_WARNING "<4>" /* warning conditions */
9#define KERN_NOTICE "<5>" /* normal but significant condition */
10#define KERN_INFO "<6>" /* informational */
11#define KERN_DEBUG "<7>" /* debug-level messages */
12
13/* Use the default kernel loglevel */
14#define KERN_DEFAULT "<d>"
15/*
16 * Annotation for a "continued" line of log printout (only done after a
17 * line that had no enclosing \n). Only to be used by core/arch code
18 * during early bootup (a continued line is not SMP-safe otherwise).
19 */
20#define KERN_CONT "<c>"
21
22#endif
diff --git a/include/linux/printk.h b/include/linux/printk.h
index 6e12e1f0904..fea2de37b64 100644
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
@@ -2,28 +2,11 @@
2#define __KERNEL_PRINTK__ 2#define __KERNEL_PRINTK__
3 3
4#include <linux/init.h> 4#include <linux/init.h>
5#include <linux/kern_levels.h>
5 6
6extern const char linux_banner[]; 7extern const char linux_banner[];
7extern const char linux_proc_banner[]; 8extern const char linux_proc_banner[];
8 9
9#define KERN_EMERG "<0>" /* system is unusable */
10#define KERN_ALERT "<1>" /* action must be taken immediately */
11#define KERN_CRIT "<2>" /* critical conditions */
12#define KERN_ERR "<3>" /* error conditions */
13#define KERN_WARNING "<4>" /* warning conditions */
14#define KERN_NOTICE "<5>" /* normal but significant condition */
15#define KERN_INFO "<6>" /* informational */
16#define KERN_DEBUG "<7>" /* debug-level messages */
17
18/* Use the default kernel loglevel */
19#define KERN_DEFAULT "<d>"
20/*
21 * Annotation for a "continued" line of log printout (only done after a
22 * line that had no enclosing \n). Only to be used by core/arch code
23 * during early bootup (a continued line is not SMP-safe otherwise).
24 */
25#define KERN_CONT "<c>"
26
27static inline int printk_get_level(const char *buffer) 10static inline int printk_get_level(const char *buffer)
28{ 11{
29 if (buffer[0] == '<' && buffer[1] && buffer[2] == '>') { 12 if (buffer[0] == '<' && buffer[1] && buffer[2] == '>') {