2 files changed, 4 insertions, 3 deletions

diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h
index 07781aaa1164..baabf33be244 100644
--- a/include/linux/dynamic_debug.h
+++ b/include/linux/dynamic_debug.h
@@ -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))                          \
-                printk(KERN_DEBUG KBUILD_MODNAME ":" fmt,               \
+                printk(KERN_DEBUG KBUILD_MODNAME ":" pr_fmt(fmt),       \
                                 ##__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,                     \
-                                        KBUILD_MODNAME ": " fmt,        \
+                                        KBUILD_MODNAME ": " pr_fmt(fmt),\
                                         ##__VA_ARGS__);                 \
         } while (0)
 
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index b5496ecbec71..914918abfdd1 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -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)
+/* dynamic_pr_debug() uses pr_fmt() internally so we don't need it here */
 #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, ...) \