Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64...

[linux-2.6-microblaze.git] / arch / arm64 / include / asm / bug.h

diff --git a/arch/arm64/include/asm/bug.h b/arch/arm64/include/asm/bug.h
index 0bfe1df..366448e 100644 (file)
--- a/arch/arm64/include/asm/bug.h
+++ b/arch/arm64/include/asm/bug.h
@@ -59,8 +59,7 @@ _BUGVERBOSE_LOCATION(__FILE__, __LINE__)              \
        unreachable();                                  \
 } while (0)
 
-#define __WARN_TAINT(taint)                            \
-       __BUG_FLAGS(BUGFLAG_TAINT(taint))
+#define __WARN_FLAGS(flags) __BUG_FLAGS(BUGFLAG_WARNING|(flags))
 
 #define HAVE_ARCH_BUG