bug: clean up helper macros to remove __WARN_TAINT()

In preparation for cleaning up "cut here" even more, this removes the
__WARN_*TAINT() helpers, as they limit the ability to add new BUGFLAG_*
flags to call sites.  They are removed by expanding them into full
__WARN_FLAGS() calls.

Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Kees Cook <[email protected]>
Cc: Arnd Bergmann <[email protected]>
Cc: Borislav Petkov <[email protected]>
Cc: Christophe Leroy <[email protected]>
Cc: Drew Davenport <[email protected]>
Cc: Feng Tang <[email protected]>
Cc: Mauro Carvalho Chehab <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Petr Mladek <[email protected]>
Cc: "Steven Rostedt (VMware)" <[email protected]>
Cc: YueHaibing <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
index 598d7072602fb9e11843b48773c20d3f611cfe96..4b18e09094cf1d4fbea4fe83c7dd35639febc510 100644 (file)
--- a/include/asm-generic/bug.h
+++ b/include/asm-generic/bug.h
@@ -62,13 +62,11 @@ struct bug_entry {
 #endif
 
 #ifdef __WARN_FLAGS
-#define __WARN_TAINT(taint)            __WARN_FLAGS(BUGFLAG_TAINT(taint))
-#define __WARN_ONCE_TAINT(taint)       __WARN_FLAGS(BUGFLAG_ONCE|BUGFLAG_TAINT(taint))
-
 #define WARN_ON_ONCE(condition) ({                             \
        int __ret_warn_on = !!(condition);                      \
        if (unlikely(__ret_warn_on))                            \
-               __WARN_ONCE_TAINT(TAINT_WARN);                  \
+               __WARN_FLAGS(BUGFLAG_ONCE |                     \
+                            BUGFLAG_TAINT(TAINT_WARN));        \
        unlikely(__ret_warn_on);                                \
 })
 #endif
@@ -89,7 +87,7 @@ struct bug_entry {
  *
  * Use the versions with printk format strings to provide better diagnostics.
  */
-#ifndef __WARN_TAINT
+#ifndef __WARN_FLAGS
 extern __printf(4, 5)
 void warn_slowpath_fmt(const char *file, const int line, unsigned taint,
                       const char *fmt, ...);
@@ -99,11 +97,14 @@ void warn_slowpath_fmt(const char *file, const int line, unsigned taint,
        warn_slowpath_fmt(__FILE__, __LINE__, taint, arg)
 #else
 extern __printf(1, 2) void __warn_printk(const char *fmt, ...);
-#define __WARN() do { \
-       printk(KERN_WARNING CUT_HERE); __WARN_TAINT(TAINT_WARN); \
-} while (0)
-#define __WARN_printf(taint, arg...)                                   \
-       do { __warn_printk(arg); __WARN_TAINT(taint); } while (0)
+#define __WARN() do {                                                  \
+               printk(KERN_WARNING CUT_HERE);                          \
+               __WARN_FLAGS(BUGFLAG_TAINT(TAINT_WARN));                \
+       } while (0)
+#define __WARN_printf(taint, arg...) do {                              \
+               __warn_printk(arg);                                     \
+               __WARN_FLAGS(BUGFLAG_TAINT(taint));                     \
+       } while (0)
 #endif
 
 /* used internally by panic.c */