The current versions of the err() / info() / warn() syslog macros insert __FILE__ at the beginning of the message, which expands to the complete path name of the source file within the kernel tree. With the following patch, when used in a module, they'll insert the module name instead, which is significantly shorter and also tends to be more useful to users trying to make sense of a particular message. This patch replaces the one posted on 24 Feb 2006 10:50:52 +0100 which caused compile errors in non-modular drivers. It applies to kernel 2.6.16-rc5 after the patch labeled "add macros notice(), dev_notice() (take 2)". Signed-off-by: Tilman Schmidt <[email protected]> --- usb.h | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) --- linux-2.6.16-rc5-patch-splitpoint/include/linux/usb.h 2006-03-08 12:36:03.000000000 +0100 +++ linux-2.6.16-rc5-patch-splitpoint2/include/linux/usb.h 2006-03-08 12:43:07.000000000 +0100 @@ -1199,14 +1199,20 @@ #define dbg(format, arg...) do {} while (0) #endif +#if defined(CONFIG_MODULES) && defined(THIS_MODULE) +#define KMSG_LOCATION_PREFIX THIS_MODULE ? THIS_MODULE->name : __FILE__ +#else +#define KMSG_LOCATION_PREFIX __FILE__ +#endif + #define err(format, arg...) printk(KERN_ERR "%s: " format "\n" , \ - __FILE__ , ## arg) + KMSG_LOCATION_PREFIX , ## arg) #define info(format, arg...) printk(KERN_INFO "%s: " format "\n" , \ - __FILE__ , ## arg) + KMSG_LOCATION_PREFIX , ## arg) #define warn(format, arg...) printk(KERN_WARNING "%s: " format "\n" , \ - __FILE__ , ## arg) + KMSG_LOCATION_PREFIX , ## arg) #define notice(format, arg...) printk(KERN_NOTICE "%s: " format "\n" , \ - __FILE__ , ## arg) + KMSG_LOCATION_PREFIX , ## arg) #endif /* __KERNEL__ */ -- Tilman Schmidt E-Mail: [email protected] Bonn, Germany Diese Nachricht besteht zu 100% aus wiederverwerteten Bits. Ungeöffnet mindestens haltbar bis: (siehe Rückseite)
Attachment:
signature.asc
Description: OpenPGP digital signature
- Follow-Ups:
- Re: [PATCH] reduce syslog clutter (take 2)
- From: Andrew Morton <[email protected]>
- Re: [PATCH] reduce syslog clutter (take 2)
- From: "Randy.Dunlap" <[email protected]>
- Re: [PATCH] reduce syslog clutter (take 2)
- Prev by Date: [PATCH] add macros notice(), dev_notice() (take 2)
- Next by Date: Re: Oops on ibmasm
- Previous by thread: [PATCH] add macros notice(), dev_notice() (take 2)
- Next by thread: Re: [PATCH] reduce syslog clutter (take 2)
- Index(es):
 |