linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/include/asm-sh64/bug.h b/include/asm-sh64/bug.h
index f3a9c92..5d659ec 100644 (file)
--- a/include/asm-sh64/bug.h
+++ b/include/asm-sh64/bug.h
@@ -1,7 +1,8 @@
 #ifndef __ASM_SH64_BUG_H
 #define __ASM_SH64_BUG_H
 
-#ifdef CONFIG_BUG
+#include <linux/config.h>
+
 /*
  * Tell the user there is some problem, then force a segfault (in process
  * context) or a panic (interrupt context).
@@ -11,9 +12,17 @@
        *(volatile int *)0 = 0; \
 } while (0)
 
-#define HAVE_ARCH_BUG
-#endif
+#define BUG_ON(condition) do { \
+       if (unlikely((condition)!=0)) \
+               BUG(); \
+} while(0)
 
-#include <asm-generic/bug.h>
+#define WARN_ON(condition) do { \
+       if (unlikely((condition)!=0)) { \
+               printk("Badness in %s at %s:%d\n", __FUNCTION__, __FILE__, __LINE__); \
+               dump_stack(); \
+       } \
+} while (0)
 
 #endif /* __ASM_SH64_BUG_H */
+