diff options
author | David S. Miller <davem@davemloft.net> | 2011-05-24 16:15:41 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-05-24 16:15:56 -0400 |
commit | 6b3678354647a653e669746c05765f05d2b90239 (patch) | |
tree | a35beb4fddd53b82dac985d7d669ab260d87f537 /include/asm-generic | |
parent | 1f37070d3ff325827c6213e51b57f21fd5ac9d05 (diff) |
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>
Diffstat (limited to 'include/asm-generic')
-rw-r--r-- | include/asm-generic/bug.h | 21 |
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); | |||
162 | unlikely(__ret_warn_once); \ | 162 | unlikely(__ret_warn_once); \ |
163 | }) | 163 | }) |
164 | 164 | ||
165 | #ifdef CONFIG_PRINTK | ||
166 | |||
165 | #define WARN_ON_RATELIMIT(condition, state) \ | 167 | #define WARN_ON_RATELIMIT(condition, state) \ |
166 | WARN_ON((condition) && __ratelimit(state)) | 168 | WARN_ON((condition) && __ratelimit(state)) |
167 | 169 | ||
@@ -181,6 +183,25 @@ extern void warn_slowpath_null(const char *file, const int line); | |||
181 | __WARN_RATELIMIT(condition, &_rs, format); \ | 183 | __WARN_RATELIMIT(condition, &_rs, format); \ |
182 | }) | 184 | }) |
183 | 185 | ||
186 | #else | ||
187 | |||
188 | #define WARN_ON_RATELIMIT(condition, state) \ | ||
189 | WARN_ON(condition) | ||
190 | |||
191 | #define __WARN_RATELIMIT(condition, state, format...) \ | ||
192 | ({ \ | ||
193 | int rtn = WARN(condition, format); \ | ||
194 | rtn; \ | ||
195 | }) | ||
196 | |||
197 | #define WARN_RATELIMIT(condition, format...) \ | ||
198 | ({ \ | ||
199 | int rtn = WARN(condition, format); \ | ||
200 | rtn; \ | ||
201 | }) | ||
202 | |||
203 | #endif | ||
204 | |||
184 | /* | 205 | /* |
185 | * WARN_ON_SMP() is for cases that the warning is either | 206 | * WARN_ON_SMP() is for cases that the warning is either |
186 | * meaningless for !SMP or may even cause failures. | 207 | * meaningless for !SMP or may even cause failures. |