summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/bug.h
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/include/asm/bug.h')
-rw-r--r--arch/x86/include/asm/bug.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/x86/include/asm/bug.h b/arch/x86/include/asm/bug.h
index 4fde330c44b7..cecf559d0012 100644
--- a/arch/x86/include/asm/bug.h
+++ b/arch/x86/include/asm/bug.h
@@ -23,7 +23,6 @@
#define LEN_UD0 2
#ifdef CONFIG_GENERIC_BUG
-#define HAVE_ARCH_BUG
#ifdef CONFIG_X86_32
# define __BUG_REL(val) ".long " __stringify(val)
@@ -64,6 +63,13 @@ do { \
#endif /* CONFIG_DEBUG_BUGVERBOSE */
+#else
+
+#define _BUG_FLAGS(ins, flags) asm volatile(ins)
+
+#endif /* CONFIG_GENERIC_BUG */
+
+#define HAVE_ARCH_BUG
#define BUG() \
do { \
_BUG_FLAGS(ASM_UD2, 0); \
@@ -72,8 +78,6 @@ do { \
#define __WARN_TAINT(taint) _BUG_FLAGS(ASM_UD0, BUGFLAG_TAINT(taint))
-#endif /* CONFIG_GENERIC_BUG */
-
#include <asm-generic/bug.h>
#endif /* _ASM_X86_BUG_H */