bug.h: Fix build with CONFIG_PRINTK disabled.
authorDavid S. Miller <davem@davemloft.net>
Tue, 24 May 2011 20:15:41 +0000 (16:15 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 24 May 2011 20:15:56 +0000 (16:15 -0400)
Based upon an email by Joe Perches.

Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
include/asm-generic/bug.h

index 12b250cdda814410639317d0debf557057b7b2fe..91784841e4079e35fe4fab89aaaf8a60c4e7b081 100644 (file)
@@ -162,6 +162,8 @@ extern void warn_slowpath_null(const char *file, const int line);
        unlikely(__ret_warn_once);                              \
 })
 
+#ifdef CONFIG_PRINTK
+
 #define WARN_ON_RATELIMIT(condition, state)                    \
                WARN_ON((condition) && __ratelimit(state))
 
@@ -181,6 +183,25 @@ extern void warn_slowpath_null(const char *file, const int line);
        __WARN_RATELIMIT(condition, &_rs, format);              \
 })
 
+#else
+
+#define WARN_ON_RATELIMIT(condition, state)                    \
+       WARN_ON(condition)
+
+#define __WARN_RATELIMIT(condition, state, format...)          \
+({                                                             \
+       int rtn = WARN(condition, format);                      \
+       rtn;                                                    \
+})
+
+#define WARN_RATELIMIT(condition, format...)                   \
+({                                                             \
+       int rtn = WARN(condition, format);                      \
+       rtn;                                                    \
+})
+
+#endif
+
 /*
  * WARN_ON_SMP() is for cases that the warning is either
  * meaningless for !SMP or may even cause failures.