From 9677215e3d1da46305b6c1f7afde77f9a3ce5aa3 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 17 Oct 2007 17:19:30 +0200
Subject: [PATCH] --- yaml --- r: 71043 b: refs/heads/master c:
 68fdc55c48fd2e8f4938a1e815216c25baf8a17e h: refs/heads/master i:   71041:
 865b478290b5b0d03e97f3cd16cb6bfccd6d3da2   71039:
 0581a9e7f08ba6ad733e626d2ac7fd03185298b4 v: v3

---
 [refs]                         |  2 +-
 trunk/include/asm-x86/bug.h    | 41 ++++++++++++++++++++++++++++++++--
 trunk/include/asm-x86/bug_32.h | 37 ------------------------------
 trunk/include/asm-x86/bug_64.h | 34 ----------------------------
 4 files changed, 40 insertions(+), 74 deletions(-)
 delete mode 100644 trunk/include/asm-x86/bug_32.h
 delete mode 100644 trunk/include/asm-x86/bug_64.h

diff --git a/[refs] b/[refs]
index 043c8c03ef0f..3eac0bb268b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c8eec501968cf9b608bba22748d7ca1a91dadf1
+refs/heads/master: 68fdc55c48fd2e8f4938a1e815216c25baf8a17e
diff --git a/trunk/include/asm-x86/bug.h b/trunk/include/asm-x86/bug.h
index c655d7f3a5e0..fd8bdc639c48 100644
--- a/trunk/include/asm-x86/bug.h
+++ b/trunk/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/trunk/include/asm-x86/bug_32.h b/trunk/include/asm-x86/bug_32.h
deleted file mode 100644
index b0fd78ca2619..000000000000
--- a/trunk/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/trunk/include/asm-x86/bug_64.h b/trunk/include/asm-x86/bug_64.h
deleted file mode 100644
index 682606414913..000000000000
--- a/trunk/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