diff -Nur linux-2.6.1-1.138.2.1/Makefile linux-2.6.1-1.138.2.1.new/Makefile --- linux-2.6.1-1.138.2.1/Makefile 2004-04-20 12:47:56.000000000 +0900 +++ linux-2.6.1-1.138.2.1.new/Makefile 2004-04-20 13:36:22.171653000 +0900 @@ -272,7 +272,7 @@ NOSTDINC_FLAGS = -nostdinc -iwithprefix include -CPPFLAGS := -D__KERNEL__ -Iinclude \ +CPPFLAGS := -D__KERNEL__ -D__EXPAND_LOGLEVEL__ -Iinclude \ $(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include) CFLAGS := -Wall -Wstrict-prototypes -Wno-trigraphs \ diff -Nur linux-2.6.1-1.138.2.1/include/linux/kernel.h linux-2.6.1- 1.138.2.1.new/include/linux/kernel.h --- linux-2.6.1-1.138.2.1/include/linux/kernel.h 2004-04-20 12:47:57.000000000 +0900 +++ linux-2.6.1-1.138.2.1.new/include/linux/kernel.h 2004-04-20 13:36:22.000000000 +0900 @@ -27,14 +27,28 @@ #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_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 */ +#ifdef __EXPAND_LOGLEVEL__ +#define stringize(p) #p +#define _expand_printk(a) stringize(a) +#define stringize_linenum() _expand_printk(__LINE__) +#define KERN_EMERG "<0>" __FILE__ "(" stringize_linenum() ")" +#define KERN_ALERT "<1>" __FILE__ "(" stringize_linenum() ")" +#define KERN_CRIT "<2>" __FILE__ "(" stringize_linenum() ")" +#define KERN_ERR "<3>" __FILE__ "(" stringize_linenum() ")" +#define KERN_WARNING "<4>" __FILE__ "(" stringize_linenum() ")" +#define KERN_NOTICE "<5>" __FILE__ "(" stringize_linenum() ")" +#define KERN_INFO "<6>" __FILE__ "(" stringize_linenum() ")" +#define KERN_DEBUG "<7>" __FILE__ "(" stringize_linenum() ")" +#else +#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 */ +#endif extern int console_printk[];