Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / include / asm-i386 / bug.h

diff --git a/include/asm-i386/bug.h b/include/asm-i386/bug.h
index 433a6e5..8f79de1 100644 (file)
--- a/include/asm-i386/bug.h
+++ b/include/asm-i386/bug.h
@@ -9,7 +9,9 @@
  * undefined" opcode for parsing in the trap handler.
  */
 
-#if 1  /* Set to zero for a slightly smaller kernel */
+#ifdef CONFIG_BUG
+#define HAVE_ARCH_BUG
+#ifdef CONFIG_DEBUG_BUGVERBOSE
 #define BUG()                          \
  __asm__ __volatile__( "ud2\n"         \
                        "\t.word %c0\n" \
@@ -18,18 +20,7 @@
 #else
 #define BUG() __asm__ __volatile__("ud2\n")
 #endif
+#endif
 
-#define BUG_ON(condition) do { if (unlikely((condition)!=0)) BUG(); } while(0)
-
-#define PAGE_BUG(page) do { \
-       BUG(); \
-} while (0)
-
-#define WARN_ON(condition) do { \
-       if (unlikely((condition)!=0)) { \
-               printk("Badness in %s at %s:%d\n", __FUNCTION__, __FILE__, __LINE__); \
-               dump_stack(); \
-       } \
-} while (0)
-
+#include <asm-generic/bug.h>
 #endif