Merge to Fedora kernel-2.6.18-1.2239_FC5 patched with stable patch-2.6.18.2-vs2.0...

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

diff --git a/include/asm-ppc64/bug.h b/include/asm-ppc64/bug.h
index 9e439ee..169868f 100644 (file)
--- a/include/asm-ppc64/bug.h
+++ b/include/asm-ppc64/bug.h
@@ -18,12 +18,16 @@ struct bug_entry {
        const char      *function;
 };
 
+struct bug_entry *find_bug(unsigned long bugaddr);
+
 /*
  * If this bit is set in the line number it means that the trap
  * is for WARN_ON rather than BUG or BUG_ON.
  */
 #define BUG_WARNING_TRAP       0x1000000
 
+#ifdef CONFIG_BUG
+
 #define BUG() do {                                                      \
        __asm__ __volatile__(                                            \
                "1:     twi 31,0,0\n"                                    \
@@ -43,8 +47,6 @@ struct bug_entry {
                    "i" (__FUNCTION__));                        \
 } while (0)
 
-#define PAGE_BUG(page) do { BUG(); } while (0)
-
 #define WARN_ON(x) do {                                                \
        __asm__ __volatile__(                                   \
                "1:     tdnei %0,0\n"                           \
@@ -55,5 +57,12 @@ struct bug_entry {
                    "i" (__FILE__), "i" (__FUNCTION__));        \
 } while (0)
 
+#define HAVE_ARCH_BUG
+#define HAVE_ARCH_BUG_ON
+#define HAVE_ARCH_WARN_ON
 #endif
 #endif
+
+#include <asm-generic/bug.h>
+
+#endif