vserver 1.9.3

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

diff --git a/include/asm-x86_64/bug.h b/include/asm-x86_64/bug.h
index 44d70de..d2032f5 100644 (file)
--- a/include/asm-x86_64/bug.h
+++ b/include/asm-x86_64/bug.h
@@ -6,27 +6,20 @@
 /*
  * Tell the user there is some problem.  The exception handler decodes 
  * this frame.
- */ 
-struct bug_frame { 
-       unsigned char ud2[2];          
+ */
+struct bug_frame {
+       unsigned char ud2[2];
        /* should use 32bit offset instead, but the assembler doesn't 
-          like it */ 
-       char *filename;   
-       unsigned short line; 
-} __attribute__((packed)); 
+          like it */
+       char *filename;
+       unsigned short line;
+} __attribute__((packed));
 
+#define HAVE_ARCH_BUG
 #define BUG() \
        asm volatile("ud2 ; .quad %c1 ; .short %c0" :: \
                     "i"(__LINE__), "i" (__stringify(KBUILD_BASENAME)))
-#define BUG_ON(condition) do { if (unlikely((condition)!=0)) BUG(); } while(0)
-#define PAGE_BUG(page) BUG()
 void out_of_line_bug(void);
-
-#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