fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/include/asm-m68k/bug.h b/include/asm-m68k/bug.h
index 1f21b0d..7b60776 100644 (file)
--- a/include/asm-m68k/bug.h
+++ b/include/asm-m68k/bug.h
@@ -1,8 +1,8 @@
 #ifndef _M68K_BUG_H
 #define _M68K_BUG_H
 
-#include <linux/config.h>
 
+#ifdef CONFIG_BUG
 #ifdef CONFIG_DEBUG_BUGVERBOSE
 #ifndef CONFIG_SUN3
 #define BUG() do { \
@@ -21,20 +21,9 @@
 } while (0)
 #endif
 
-#define BUG_ON(condition) do { \
-       if (unlikely((condition)!=0)) \
-               BUG(); \
-} while(0)
-
-#define PAGE_BUG(page) do { \
-       BUG(); \
-} while (0)
+#define HAVE_ARCH_BUG
+#endif
 
-#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