]> git.karo-electronics.de Git - karo-tx-linux.git/blobdiff - arch/powerpc/include/asm/bug.h
Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[karo-tx-linux.git] / arch / powerpc / include / asm / bug.h
index 3a39283333c3cdbba5139f1c97f83d7f36815ed9..0151af6c2a505a77c512110271e73f0c9c3fcd6e 100644 (file)
        }                                                       \
 } while (0)
 
-#define __WARN_TAINT(taint) do {                               \
+#define __WARN_FLAGS(flags) do {                               \
        __asm__ __volatile__(                                   \
                "1:     twi 31,0,0\n"                           \
                _EMIT_BUG_ENTRY                                 \
                : : "i" (__FILE__), "i" (__LINE__),             \
-                 "i" (BUGFLAG_TAINT(taint)),                   \
+                 "i" (BUGFLAG_WARNING|(flags)),                \
                  "i" (sizeof(struct bug_entry)));              \
 } while (0)
 
                "1:     "PPC_TLNEI"     %4,0\n"                 \
                _EMIT_BUG_ENTRY                                 \
                : : "i" (__FILE__), "i" (__LINE__),             \
-                 "i" (BUGFLAG_TAINT(TAINT_WARN)),              \
+                 "i" (BUGFLAG_WARNING|BUGFLAG_TAINT(TAINT_WARN)),\
                  "i" (sizeof(struct bug_entry)),               \
                  "r" (__ret_warn_on));                         \
        }                                                       \