Skip to content

Commit

Permalink
printk: add kern_levels.h to make KERN_<LEVEL> available for asm use
Browse files Browse the repository at this point in the history
Separate the printk.h file into 2 pieces so the definitions can be used in
asm files.

Signed-off-by: Joe Perches <[email protected]>
Cc: Kay Sievers <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
JoePerches authored and torvalds committed Jul 31, 2012
1 parent acc8fa4 commit 314ba35
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 18 deletions.
22 changes: 22 additions & 0 deletions include/linux/kern_levels.h
Original file line number Diff line number Diff line change
@@ -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
19 changes: 1 addition & 18 deletions include/linux/printk.h
Original file line number Diff line number Diff line change
Expand Up @@ -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] == '>') {
Expand Down

0 comments on commit 314ba35

Please sign in to comment.