fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/include/asm-xtensa/bug.h b/include/asm-xtensa/bug.h
index 5670365..3e52d72 100644 (file)
--- a/include/asm-xtensa/bug.h
+++ b/include/asm-xtensa/bug.h
@@ -13,29 +13,6 @@
 #ifndef _XTENSA_BUG_H
 #define _XTENSA_BUG_H
 
-#include <linux/stringify.h>
-
-#define ILL    __asm__ __volatile__ (".byte 0,0,0\n")
-
-#ifdef CONFIG_KALLSYMS
-# define BUG() do {                                                    \
-       printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__);           \
-       ILL;                                                            \
-} while (0)
-#else
-# define BUG() do {                                                    \
-       printk("kernel BUG!\n");                                        \
-       ILL;                                                            \
-} while (0)
-#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 ("Warning in %s at %s:%d\n", __FUNCTION__, __FILE__, __LINE__); \
-      dump_stack();                                                       \
-  }                                                                       \
-} while (0)
+#include <asm-generic/bug.h>
 
 #endif /* _XTENSA_BUG_H */