summaryrefslogtreecommitdiffstats
path: root/include/asm-x86/bug.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-10-17 17:19:30 +0200
committerThomas Gleixner <tglx@inhelltoy.tec.linutronix.de>2007-10-17 20:26:16 +0200
commit68fdc55c48fd2e8f4938a1e815216c25baf8a17e (patch)
treecb2eb56828877dcd06f750052adc893c56e7b164 /include/asm-x86/bug.h
parent5c8eec501968cf9b608bba22748d7ca1a91dadf1 (diff)
downloadop-kernel-dev-68fdc55c48fd2e8f4938a1e815216c25baf8a17e.zip
op-kernel-dev-68fdc55c48fd2e8f4938a1e815216c25baf8a17e.tar.gz
x86: unify include/asm/bug_32/64.h
Same file, except for whitespace, comment formatting and the .long/.quad delta which can be solved by a define. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/asm-x86/bug.h')
-rw-r--r--include/asm-x86/bug.h41
1 files changed, 39 insertions, 2 deletions
diff --git a/include/asm-x86/bug.h b/include/asm-x86/bug.h
index c655d7f..fd8bdc6 100644
--- a/include/asm-x86/bug.h
+++ b/include/asm-x86/bug.h
@@ -1,5 +1,42 @@
+#ifndef _ASM_X86_BUG_H
+#define _ASM_X86_BUG_H
+
+#ifdef CONFIG_BUG
+#define HAVE_ARCH_BUG
+
+#ifdef CONFIG_DEBUG_BUGVERBOSE
+
#ifdef CONFIG_X86_32
-# include "bug_32.h"
+# define __BUG_C0 "2:\t.long 1b, %c0\n"
#else
-# include "bug_64.h"
+# define __BUG_C0 "2:\t.quad 1b, %c0\n"
+#endif
+
+#define BUG() \
+ do { \
+ asm volatile("1:\tud2\n" \
+ ".pushsection __bug_table,\"a\"\n" \
+ __BUG_C0 \
+ "\t.word %c1, 0\n" \
+ "\t.org 2b+%c2\n" \
+ ".popsection" \
+ : : "i" (__FILE__), "i" (__LINE__), \
+ "i" (sizeof(struct bug_entry))); \
+ for(;;) ; \
+ } while(0)
+
+#else
+#define BUG() \
+ do { \
+ asm volatile("ud2"); \
+ for(;;) ; \
+ } while(0)
+#endif
+
+void out_of_line_bug(void);
+#else /* CONFIG_BUG */
+static inline void out_of_line_bug(void) { }
+#endif /* !CONFIG_BUG */
+
+#include <asm-generic/bug.h>
#endif
OpenPOWER on IntegriCloud