Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

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

diff --git a/include/asm-sh64/bug.h b/include/asm-sh64/bug.h
index 9a81b72..f3a9c92 100644 (file)
--- a/include/asm-sh64/bug.h
+++ b/include/asm-sh64/bug.h
@@ -1,7 +1,19 @@
 #ifndef __ASM_SH64_BUG_H
 #define __ASM_SH64_BUG_H
 
-#include <asm-sh/bug.h>
+#ifdef CONFIG_BUG
+/*
+ * Tell the user there is some problem, then force a segfault (in process
+ * context) or a panic (interrupt context).
+ */
+#define BUG() do { \
+       printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
+       *(volatile int *)0 = 0; \
+} while (0)
 
-#endif /* __ASM_SH64_BUG_H */
+#define HAVE_ARCH_BUG
+#endif
+
+#include <asm-generic/bug.h>
 
+#endif /* __ASM_SH64_BUG_H */