3 files changed, 39 insertions, 73 deletions
diff --git a/include/asm-x86/bug.h b/include/asm-x86/bug.h
index c655d7f3a5e..fd8bdc639c4 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
diff --git a/include/asm-x86/bug_32.h b/include/asm-x86/bug_32.h
deleted file mode 100644
index b0fd78ca261..00000000000
--- 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
index 68260641491..00000000000
--- 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

diff --git a/include/asm-x86/bug.h b/include/asm-x86/bug.h index c655d7f3a5e..fd8bdc639c4 100644 --- a/include/asm-x86/bug.h +++ b/include/asm-x86/bug.h
@@ -1,5 +1,42 @@
		1	#ifndef _ASM_X86_BUG_H
		2	#define _ASM_X86_BUG_H
		3
		4	#ifdef CONFIG_BUG
		5	#define HAVE_ARCH_BUG
		6
		7	#ifdef CONFIG_DEBUG_BUGVERBOSE
		8
1	#ifdef CONFIG_X86_32	9	#ifdef CONFIG_X86_32
2	# include "bug_32.h"	10	# define __BUG_C0 "2:\t.long 1b, %c0\n"
3	#else	11	#else
4	# include "bug_64.h"	12	# define __BUG_C0 "2:\t.quad 1b, %c0\n"
		13	#endif
		14
		15	#define BUG() \
		16	do { \
		17	asm volatile("1:\tud2\n" \
		18	".pushsection __bug_table,\"a\"\n" \
		19	__BUG_C0 \
		20	"\t.word %c1, 0\n" \
		21	"\t.org 2b+%c2\n" \
		22	".popsection" \
		23	: : "i" (__FILE__), "i" (__LINE__), \
		24	"i" (sizeof(struct bug_entry))); \
		25	for(;;) ; \
		26	} while(0)
		27
		28	#else
		29	#define BUG() \
		30	do { \
		31	asm volatile("ud2"); \
		32	for(;;) ; \
		33	} while(0)
		34	#endif
		35
		36	void out_of_line_bug(void);
		37	#else /* CONFIG_BUG */
		38	static inline void out_of_line_bug(void) { }
		39	#endif /* !CONFIG_BUG */
		40
		41	#include <asm-generic/bug.h>
5	#endif	42	#endif


diff --git a/include/asm-x86/bug_32.h b/include/asm-x86/bug_32.h deleted file mode 100644 index b0fd78ca261..00000000000 --- a/include/asm-x86/bug_32.h +++ /dev/null
@@ -1,37 +0,0 @@
1	#ifndef _I386_BUG_H
2	#define _I386_BUG_H
3
4
5	/*
6	* Tell the user there is some problem.
7	* The offending file and line are encoded encoded in the __bug_table section.
8	*/
9
10	#ifdef CONFIG_BUG
11	#define HAVE_ARCH_BUG
12
13	#ifdef CONFIG_DEBUG_BUGVERBOSE
14	#define BUG() \
15	do { \
16	asm volatile("1:\tud2\n" \
17	".pushsection __bug_table,\"a\"\n" \
18	"2:\t.long 1b, %c0\n" \
19	"\t.word %c1, 0\n" \
20	"\t.org 2b+%c2\n" \
21	".popsection" \
22	: : "i" (__FILE__), "i" (__LINE__), \
23	"i" (sizeof(struct bug_entry))); \
24	for(;;) ; \
25	} while(0)
26
27	#else
28	#define BUG() \
29	do { \
30	asm volatile("ud2"); \
31	for(;;) ; \
32	} while(0)
33	#endif
34	#endif
35
36	#include <asm-generic/bug.h>
37	#endif


diff --git a/include/asm-x86/bug_64.h b/include/asm-x86/bug_64.h deleted file mode 100644 index 68260641491..00000000000 --- a/include/asm-x86/bug_64.h +++ /dev/null
@@ -1,34 +0,0 @@
1	#ifndef __ASM_X8664_BUG_H
2	#define __ASM_X8664_BUG_H 1
3
4	#ifdef CONFIG_BUG
5	#define HAVE_ARCH_BUG
6
7	#ifdef CONFIG_DEBUG_BUGVERBOSE
8	#define BUG() \
9	do { \
10	asm volatile("1:\tud2\n" \
11	".pushsection __bug_table,\"a\"\n" \
12	"2:\t.quad 1b, %c0\n" \
13	"\t.word %c1, 0\n" \
14	"\t.org 2b+%c2\n" \
15	".popsection" \
16	: : "i" (__FILE__), "i" (__LINE__), \
17	"i" (sizeof(struct bug_entry))); \
18	for(;;) ; \
19	} while(0)
20	#else
21	#define BUG() \
22	do { \
23	asm volatile("ud2"); \
24	for(;;) ; \
25	} while(0)
26	#endif
27
28	void out_of_line_bug(void);
29	#else
30	static inline void out_of_line_bug(void) { }
31	#endif
32
33	#include <asm-generic/bug.h>
34	#endif