Dynamic debug: fix pr_fmt() build error
authorGreg Banks <gnb@sgi.com>
Wed, 11 Mar 2009 10:07:28 +0000 (21:07 +1100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 24 Mar 2009 23:38:27 +0000 (16:38 -0700)
When CONFIG_DYNAMIC_DEBUG is enabled, allow callers of pr_debug()
to provide their own definition of pr_fmt() even if that definition
uses tricks like

#define pr_fmt(fmt) "%s:" fmt, __func__

Signed-off-by: Greg Banks <gnb@sgi.com>
Cc: Jason Baron <jbaron@redhat.com>
Acked-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
include/linux/dynamic_debug.h
include/linux/kernel.h

index 07781aaa1164bcb6c37ec4c5800f027cae838550..baabf33be244b9870cad0f440fbd1bc8a5771516 100644 (file)
@@ -57,7 +57,7 @@ extern int ddebug_remove_module(char *mod_name);
        { KBUILD_MODNAME, __func__, __FILE__, fmt, DEBUG_HASH,  \
                DEBUG_HASH2, __LINE__, _DPRINTK_FLAGS_DEFAULT };        \
        if (__dynamic_dbg_enabled(descriptor))                          \
        { KBUILD_MODNAME, __func__, __FILE__, fmt, DEBUG_HASH,  \
                DEBUG_HASH2, __LINE__, _DPRINTK_FLAGS_DEFAULT };        \
        if (__dynamic_dbg_enabled(descriptor))                          \
-               printk(KERN_DEBUG KBUILD_MODNAME ":" fmt,               \
+               printk(KERN_DEBUG KBUILD_MODNAME ":" pr_fmt(fmt),       \
                                ##__VA_ARGS__);                         \
        } while (0)
 
                                ##__VA_ARGS__);                         \
        } while (0)
 
@@ -70,7 +70,7 @@ extern int ddebug_remove_module(char *mod_name);
                DEBUG_HASH2, __LINE__, _DPRINTK_FLAGS_DEFAULT };        \
        if (__dynamic_dbg_enabled(descriptor))                          \
                        dev_printk(KERN_DEBUG, dev,                     \
                DEBUG_HASH2, __LINE__, _DPRINTK_FLAGS_DEFAULT };        \
        if (__dynamic_dbg_enabled(descriptor))                          \
                        dev_printk(KERN_DEBUG, dev,                     \
-                                       KBUILD_MODNAME ": " fmt,        \
+                                       KBUILD_MODNAME ": " pr_fmt(fmt),\
                                        ##__VA_ARGS__);                 \
        } while (0)
 
                                        ##__VA_ARGS__);                 \
        } while (0)
 
index b5496ecbec7124c21fd0cfd43fb422c9ec9ee296..914918abfdd122a5bf9a6c564fd7c41693917c9b 100644 (file)
@@ -359,8 +359,9 @@ static inline char *pack_hex_byte(char *buf, u8 byte)
 #define pr_debug(fmt, ...) \
        printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)
 #elif defined(CONFIG_DYNAMIC_DEBUG)
 #define pr_debug(fmt, ...) \
        printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)
 #elif defined(CONFIG_DYNAMIC_DEBUG)
+/* dynamic_pr_debug() uses pr_fmt() internally so we don't need it here */
 #define pr_debug(fmt, ...) do { \
 #define pr_debug(fmt, ...) do { \
-       dynamic_pr_debug(pr_fmt(fmt), ##__VA_ARGS__); \
+       dynamic_pr_debug(fmt, ##__VA_ARGS__); \
        } while (0)
 #else
 #define pr_debug(fmt, ...) \
        } while (0)
 #else
 #define pr_debug(fmt, ...) \