From: Andy Gospodreak <andy@greyhouse.net>
Date: Fri, 10 Aug 2012 20:57:16 +0000 (-0400)
Subject: compat: fixup error in no_printk definition
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=92aaac94204a178c40aee939f7f3beeb067c5902;p=openwrt%2Fstaging%2Fblogic.git

compat: fixup error in no_printk definition

What initially looked like a valid definition for the #define for
no_printk was not.  This corrects the problem and the change that was
thought to correct it.

Signed-off-by: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
---

diff --git a/include/linux/compat-2.6.36.h b/include/linux/compat-2.6.36.h
index b6757c395bb8..cd5e37ca6b0d 100644
--- a/include/linux/compat-2.6.36.h
+++ b/include/linux/compat-2.6.36.h
@@ -99,9 +99,9 @@ struct pm_qos_request_list {
  * gcc's format and side-effect checking.
  */
 /* mask no_printk as RHEL6 backports this */
-#define no_printk(...) compat_no_printk(...)
+#define no_printk(a, ...) compat_no_printk(a, ##__VA_ARGS__)
 static inline __attribute__ ((format (printf, 1, 2)))
-int compat_no_printk(const char *s, ...) { return 0; }
+int no_printk(const char *s, ...) { return 0; }
 
 #ifndef alloc_workqueue
 #define alloc_workqueue(name, flags, max_active) __create_workqueue(name, flags, max_active, 0)