hrtimer: fix *rmtp handling in hrtimer_nanosleep()

[pandora-kernel.git] / include / asm-x86 / bug.h

diff --git a/include/asm-x86/bug.h b/include/asm-x86/bug.h
index c655d7f..8d477a2 100644 (file)
--- a/include/asm-x86/bug.h
+++ b/include/asm-x86/bug.h
@@ -1,5 +1,39 @@
+#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
+
+#endif /* !CONFIG_BUG */
+
+#include <asm-generic/bug.h>
 #endif