aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Triplett2014-04-07 15:39:12 -0700
committerLinus Torvalds2014-04-07 16:36:10 -0700
commit4e50ebde32bed67a9aec8c239bbd89e5d0b8727b (patch)
treeedd795dfd8709ed19b766977350df17f2e3ac19b
parenta3f7607d09e28520ad6d86ea423051605f7d4c6f (diff)
bug: when !CONFIG_BUG, make WARN call no_printk to check format and args
The stub version of WARN for !CONFIG_BUG completely ignored its format string and subsequent arguments; make it check them instead, using no_printk. Signed-off-by: Josh Triplett <josh@joshtriplett.org> Reported-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/asm-generic/bug.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
index 2d54d8df7bd1..a97fa11aaf41 100644
--- a/include/asm-generic/bug.h
+++ b/include/asm-generic/bug.h
@@ -155,6 +155,7 @@ extern void warn_slowpath_null(const char *file, const int line);
#ifndef WARN
#define WARN(condition, format...) ({ \
int __ret_warn_on = !!(condition); \
+ no_printk(format); \
unlikely(__ret_warn_on); \
})
#endif