Merge branch 'linus' into core/printk

1 files changed, 4 insertions, 3 deletions

diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 2755165bb291..6e4406e12c6b 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -16,7 +16,7 @@
 #include <linux/log2.h>
 #include <linux/typecheck.h>
 #include <linux/ratelimit.h>
-#include <linux/dynamic_printk.h>
+#include <linux/dynamic_debug.h>
 #include <asm/byteorder.h>
 #include <asm/bug.h>
 
@@ -375,9 +375,10 @@ static inline char *pack_hex_byte(char *buf, u8 byte)
 #if defined(DEBUG)
 #define pr_debug(fmt, ...) \
         printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)
-#elif defined(CONFIG_DYNAMIC_PRINTK_DEBUG)
+#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, ...) \