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

[uclinux-h8/linux.git] / arch / arm64 / include / asm / bug.h

diff --git a/arch/arm64/include/asm/bug.h b/arch/arm64/include/asm/bug.h
index a9be107..366448e 100644 (file)
--- a/arch/arm64/include/asm/bug.h
+++ b/arch/arm64/include/asm/bug.h
@@ -20,9 +20,6 @@
 
 #include <asm/brk-imm.h>
 
-#ifdef CONFIG_GENERIC_BUG
-#define HAVE_ARCH_BUG
-
 #ifdef CONFIG_DEBUG_BUGVERBOSE
 #define _BUGVERBOSE_LOCATION(file, line) __BUGVERBOSE_LOCATION(file, line)
 #define __BUGVERBOSE_LOCATION(file, line)                              \
@@ -36,28 +33,35 @@
 #define _BUGVERBOSE_LOCATION(file, line)
 #endif
 
-#define _BUG_FLAGS(flags) __BUG_FLAGS(flags)
+#ifdef CONFIG_GENERIC_BUG
 
-#define __BUG_FLAGS(flags) asm volatile (              \
+#define __BUG_ENTRY(flags)                             \
                ".pushsection __bug_table,\"a\"\n\t"    \
                ".align 2\n\t"                          \
        "0:     .long 1f - 0b\n\t"                      \
 _BUGVERBOSE_LOCATION(__FILE__, __LINE__)               \
                ".short " #flags "\n\t"                 \
                ".popsection\n"                         \
-                                                       \
-       "1:     brk %[imm]"                             \
-               :: [imm] "i" (BUG_BRK_IMM)              \
-)
+       "1:     "
+#else
+#define __BUG_ENTRY(flags) ""
+#endif
+
+#define __BUG_FLAGS(flags)                             \
+       asm volatile (                                  \
+               __BUG_ENTRY(flags)                      \
+               "brk %[imm]" :: [imm] "i" (BUG_BRK_IMM) \
+       );
 
-#define BUG() do {                             \
-       _BUG_FLAGS(0);                          \
-       unreachable();                          \
+
+#define BUG() do {                                     \
+       __BUG_FLAGS(0);                                 \
+       unreachable();                                  \
 } while (0)
 
-#define __WARN_FLAGS(flags) _BUG_FLAGS(BUGFLAG_WARNING|(flags))
+#define __WARN_FLAGS(flags) __BUG_FLAGS(BUGFLAG_WARNING|(flags))
 
-#endif /* ! CONFIG_GENERIC_BUG */
+#define HAVE_ARCH_BUG
 
 #include <asm-generic/bug.h>