--- include/linux/kernel.h~ Mon Apr 7 18:30:33 2003 +++ include/linux/kernel.h Thu Apr 10 09:58:13 2003 @@ -29,18 +29,29 @@ #define STACK_MAGIC 0xdeadbeef #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) #define ALIGN(x,a) (((x)+(a)-1)&~((a)-1)) -#define KERN_EMERG "<0>" /* system is unusable */ +#define KERN_NO_EMERG "0" /* system is unusable */ -#define KERN_ALERT "<1>" /* action must be taken immediately */ +#define KERN_NO_ALERT "1" /* action must be taken immediately */ -#define KERN_CRIT "<2>" /* critical conditions */ +#define KERN_NO_CRIT "2" /* critical conditions */ -#define KERN_ERR "<3>" /* error conditions */ +#define KERN_NO_ERR "3" /* error conditions */ -#define KERN_WARNING "<4>" /* warning conditions */ +#define KERN_NO_WARNING "4" /* warning conditions */ -#define KERN_NOTICE "<5>" /* normal but significant condition */ +#define KERN_NO_NOTICE "5" /* normal but significant condition */ -#define KERN_INFO "<6>" /* informational */ +#define KERN_NO_INFO "6" /* informational */ -#define KERN_DEBUG "<7>" /* debug-level messages */ +#define KERN_NO_DEBUG "7" /* debug-level messages */ + +#define KERN_NO(x,y) "<" x ":" y ">" + +#define KERN_EMERG KERN_NO(KERN_NO_EMERG, "0000") +#define KERN_ALERT KERN_NO(KERN_NO_ALERT, "0000") +#define KERN_CRIT KERN_NO(KERN_NO_CRIT, "0000") +#define KERN_ERR KERN_NO(KERN_NO_ERR, "0000") +#define KERN_WARNING KERN_NO(KERN_NO_WARNING,"0000") +#define KERN_NOTICE KERN_NO(KERN_NO_NOTICE, "0000") +#define KERN_INFO KERN_NO(KERN_NO_INFO, "0000") +#define KERN_DEBUG KERN_NO(KERN_NO_DEBUG, "0000") extern int console_printk[]; #define console_loglevel (console_printk[0]) #define default_message_loglevel (console_printk[1])