summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-05-25 00:15:41 +0400
committerDavid S. Miller <davem@davemloft.net>2011-05-25 00:15:56 +0400
commit6b3678354647a653e669746c05765f05d2b90239 (patch)
treea35beb4fddd53b82dac985d7d669ab260d87f537
parent1f37070d3ff325827c6213e51b57f21fd5ac9d05 (diff)
downloadlinux-6b3678354647a653e669746c05765f05d2b90239.tar.xz
bug.h: Fix build with CONFIG_PRINTK disabled.
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>
-rw-r--r--include/asm-generic/bug.h21
1 files changed, 21 insertions, 0 deletions
diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
index 12b250cdda81..91784841e407 100644
--- a/include/asm-generic/bug.h
+++ b/include/asm-generic/bug.h
@@ -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.