From 7c2ddf47e5300d9fb186aa01d4b23eb7b9b31911 Mon Sep 17 00:00:00 2001
From: Greg Banks <gnb@sgi.com>
Date: Wed, 11 Mar 2009 21:07:28 +1100
Subject: [PATCH] --- yaml --- r: 133469 b: refs/heads/master c:
 e6e66b02e11563abdb7f69dcb7a2efbd8d577e77 h: refs/heads/master i:   133467:
 9d5c8bb26fad9237e850dcc1dcf720db934b9d21 v: v3

---
 [refs]                              | 2 +-
 trunk/include/linux/dynamic_debug.h | 4 ++--
 trunk/include/linux/kernel.h        | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b1d0f381c15d..9b02c88282a8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9898abb3d23311fa227a7f46bf4e40fd2954057f
+refs/heads/master: e6e66b02e11563abdb7f69dcb7a2efbd8d577e77
diff --git a/trunk/include/linux/dynamic_debug.h b/trunk/include/linux/dynamic_debug.h
index 07781aaa1164..baabf33be244 100644
--- a/trunk/include/linux/dynamic_debug.h
+++ b/trunk/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/trunk/include/linux/kernel.h b/trunk/include/linux/kernel.h
index b5496ecbec71..914918abfdd1 100644
--- a/trunk/include/linux/kernel.h
+++ b/trunk/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, ...) \