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>

diff --git a/include/asm-x86/bug.h b/include/asm-x86/bug.h
index c655d7f..fd8bdc6 100644 (file)
--- 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

diff --git a/include/asm-x86/bug_32.h b/include/asm-x86/bug_32.h
deleted file mode 100644 (file)
index b0fd78c..0000000
--- a/include/asm-x86/bug_32.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef _I386_BUG_H
-#define _I386_BUG_H
-
-
-/*
- * Tell the user there is some problem.
- * The offending file and line are encoded encoded in the __bug_table section.
- */
-
-#ifdef CONFIG_BUG
-#define HAVE_ARCH_BUG
-
-#ifdef CONFIG_DEBUG_BUGVERBOSE
-#define BUG()                                                          \
-       do {                                                            \
-               asm volatile("1:\tud2\n"                                \
-                            ".pushsection __bug_table,\"a\"\n"         \
-                            "2:\t.long 1b, %c0\n"                      \
-                            "\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
-#endif
-
-#include <asm-generic/bug.h>
-#endif

diff --git a/include/asm-x86/bug_64.h b/include/asm-x86/bug_64.h
deleted file mode 100644 (file)
index 6826064..0000000
--- a/include/asm-x86/bug_64.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef __ASM_X8664_BUG_H
-#define __ASM_X8664_BUG_H 1
-
-#ifdef CONFIG_BUG
-#define HAVE_ARCH_BUG
-
-#ifdef CONFIG_DEBUG_BUGVERBOSE
-#define BUG()                                                          \
-       do {                                                            \
-               asm volatile("1:\tud2\n"                                \
-                            ".pushsection __bug_table,\"a\"\n"         \
-                            "2:\t.quad 1b, %c0\n"                      \
-                            "\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
-static inline void out_of_line_bug(void) { }
-#endif
-
-#include <asm-generic/bug.h>
-#endif