1 files changed, 25 insertions, 21 deletions

diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 396a350b87a6..dc7e0d0a6474 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -116,6 +116,8 @@ extern int _cond_resched(void);
 # define might_resched() do { } while (0)
 #endif
 
+#ifdef CONFIG_DEBUG_SPINLOCK_SLEEP
+  void __might_sleep(char *file, int line);
 /**
  * might_sleep - annotation for functions that can sleep
  *
@@ -126,8 +128,6 @@ extern int _cond_resched(void);
  * be bitten later when the calling function happens to sleep when it is not
  * supposed to.
  */
-#ifdef CONFIG_DEBUG_SPINLOCK_SLEEP
-  void __might_sleep(char *file, int line);
 # define might_sleep() \
         do { __might_sleep(__FILE__, __LINE__); might_resched(); } while (0)
 #else
@@ -318,32 +318,36 @@ static inline char *pack_hex_byte(char *buf, u8 byte)
         return buf;
 }
 
-#define pr_emerg(fmt, arg...) \
-        printk(KERN_EMERG fmt, ##arg)
-#define pr_alert(fmt, arg...) \
-        printk(KERN_ALERT fmt, ##arg)
-#define pr_crit(fmt, arg...) \
-        printk(KERN_CRIT fmt, ##arg)
-#define pr_err(fmt, arg...) \
-        printk(KERN_ERR fmt, ##arg)
-#define pr_warning(fmt, arg...) \
-        printk(KERN_WARNING fmt, ##arg)
-#define pr_notice(fmt, arg...) \
-        printk(KERN_NOTICE fmt, ##arg)
-#define pr_info(fmt, arg...) \
-        printk(KERN_INFO fmt, ##arg)
+#ifndef pr_fmt
+#define pr_fmt(fmt) fmt
+#endif
+
+#define pr_emerg(fmt, ...) \
+        printk(KERN_EMERG pr_fmt(fmt), ##__VA_ARGS__)
+#define pr_alert(fmt, ...) \
+        printk(KERN_ALERT pr_fmt(fmt), ##__VA_ARGS__)
+#define pr_crit(fmt, ...) \
+        printk(KERN_CRIT pr_fmt(fmt), ##__VA_ARGS__)
+#define pr_err(fmt, ...) \
+        printk(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__)
+#define pr_warning(fmt, ...) \
+        printk(KERN_WARNING pr_fmt(fmt), ##__VA_ARGS__)
+#define pr_notice(fmt, ...) \
+        printk(KERN_NOTICE pr_fmt(fmt), ##__VA_ARGS__)
+#define pr_info(fmt, ...) \
+        printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)
 
 /* If you are writing a driver, please use dev_dbg instead */
 #if defined(CONFIG_DYNAMIC_PRINTK_DEBUG)
 #define pr_debug(fmt, ...) do { \
-        dynamic_pr_debug(fmt, ##__VA_ARGS__); \
+        dynamic_pr_debug(pr_fmt(fmt), ##__VA_ARGS__); \
         } while (0)
 #elif defined(DEBUG)
-#define pr_debug(fmt, arg...) \
-        printk(KERN_DEBUG fmt, ##arg)
+#define pr_debug(fmt, ...) \
+        printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)
 #else
-#define pr_debug(fmt, arg...) \
-        ({ if (0) printk(KERN_DEBUG fmt, ##arg); 0; })
+#define pr_debug(fmt, ...) \
+        ({ if (0) printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__); 0; })
 #endif
 
 /*