Merge branch 'linus' into x86/core

[linux-2.6-omap-h63xx.git] / include / asm-x86 / bug.h

diff --git a/include/asm-x86/bug.h b/include/asm-x86/bug.h
index 8d477a201392ec7c7fed8b4bbd0418c8e3884d31..91ad43a54c47c6f9b9cb28bfc3cb7003a7b666a1 100644 (file)
--- a/include/asm-x86/bug.h
+++ b/include/asm-x86/bug.h
@@ -1,5 +1,5 @@
-#ifndef _ASM_X86_BUG_H
-#define _ASM_X86_BUG_H
+#ifndef ASM_X86__BUG_H
+#define ASM_X86__BUG_H
 
 #ifdef CONFIG_BUG
 #define HAVE_ARCH_BUG
@@ -12,28 +12,28 @@
 # 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)
+#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)
+#define BUG()                                                  \
+do {                                                           \
+       asm volatile("ud2");                                    \
+       for (;;) ;                                              \
+} while (0)
 #endif
 
 #endif /* !CONFIG_BUG */
 
 #include <asm-generic/bug.h>
-#endif
+#endif /* ASM_X86__BUG_H */