Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest

1 files changed, 7 insertions, 1 deletions

diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h
index 1c70028f81f9..0c9653f11c18 100644
--- a/include/linux/dynamic_debug.h
+++ b/include/linux/dynamic_debug.h
@@ -31,6 +31,10 @@ struct _ddebug {
          * writes commands to <debugfs>/dynamic_debug/control
          */
 #define _DPRINTK_FLAGS_PRINT   (1<<0)  /* printk() a message using the format */
+#define _DPRINTK_FLAGS_INCL_MODNAME     (1<<1)
+#define _DPRINTK_FLAGS_INCL_FUNCNAME    (1<<2)
+#define _DPRINTK_FLAGS_INCL_LINENO      (1<<3)
+#define _DPRINTK_FLAGS_INCL_TID         (1<<4)
 #define _DPRINTK_FLAGS_DEFAULT 0
         unsigned int flags:8;
         char enabled;
@@ -42,6 +46,8 @@ int ddebug_add_module(struct _ddebug *tab, unsigned int n,
 
 #if defined(CONFIG_DYNAMIC_DEBUG)
 extern int ddebug_remove_module(const char *mod_name);
+extern int __dynamic_pr_debug(struct _ddebug *descriptor, const char *fmt, ...)
+        __attribute__ ((format (printf, 2, 3)));
 
 #define dynamic_pr_debug(fmt, ...) do {                                 \
         static struct _ddebug descriptor                                \
@@ -50,7 +56,7 @@ extern int ddebug_remove_module(const char *mod_name);
         { KBUILD_MODNAME, __func__, __FILE__, fmt, __LINE__,            \
                 _DPRINTK_FLAGS_DEFAULT };                               \
         if (unlikely(descriptor.enabled))                               \
-                printk(KERN_DEBUG pr_fmt(fmt),  ##__VA_ARGS__);         \
+                __dynamic_pr_debug(&descriptor, pr_fmt(fmt), ##__VA_ARGS__); \
         } while (0)