vserver 1.9.3

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

diff --git a/include/asm-sparc/bug.h b/include/asm-sparc/bug.h
index 8f04d61..0d30a67 100644 (file)
--- a/include/asm-sparc/bug.h
+++ b/include/asm-sparc/bug.h
@@ -8,7 +8,7 @@
  */
 #if (__GNUC__ > 3) || \
     (__GNUC__ == 3 && __GNUC_MINOR__ > 3) || \
-    (__GNUC__ == 3 && __GNUC_MINOR__ == 3 && __GNUC_PATCHLEVEL__ >= 1)
+    (__GNUC__ == 3 && __GNUC_MINOR__ == 3 && __GNUC_PATCHLEVEL__ >= 4)
 #define __bug_trap()           __builtin_trap()
 #else
 #define __bug_trap()                                   \
@@ -25,20 +25,7 @@ extern void do_BUG(const char *file, int line);
 #define BUG()          __bug_trap()
 #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)
+#define HAVE_ARCH_BUG
+#include <asm-generic/bug.h>
 
 #endif