1 files changed, 83 insertions, 5 deletions

diff --git a/include/asm-parisc/bug.h b/include/asm-parisc/bug.h
index 695588da41f8..83ba510ed5d8 100644
--- a/include/asm-parisc/bug.h
+++ b/include/asm-parisc/bug.h
@@ -1,14 +1,92 @@
 #ifndef _PARISC_BUG_H
 #define _PARISC_BUG_H
 
+/*
+ * Tell the user there is some problem.
+ * The offending file and line are encoded in the __bug_table section.
+ */
+
 #ifdef CONFIG_BUG
 #define HAVE_ARCH_BUG
-#define BUG() do { \
-        printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
-        dump_stack(); \
-        panic("BUG!"); \
-} while (0)
+#define HAVE_ARCH_WARN_ON
+
+/* the break instruction is used as BUG() marker.  */
+#define PARISC_BUG_BREAK_ASM    "break 0x1f, 0x1fff"
+#define PARISC_BUG_BREAK_INSN   0x03ffe01f  /* PARISC_BUG_BREAK_ASM */
+
+#if defined(CONFIG_64BIT)
+#define ASM_WORD_INSN           ".dword\t"
+#else
+#define ASM_WORD_INSN           ".word\t"
+#endif
+
+#ifdef CONFIG_DEBUG_BUGVERBOSE
+#define BUG()                                                           \
+        do {                                                            \
+                asm volatile("\n"                                       \
+                             "1:\t" PARISC_BUG_BREAK_ASM "\n"           \
+                             "\t.pushsection __bug_table,\"a\"\n"       \
+                             "2:\t" ASM_WORD_INSN "1b, %c0\n"           \
+                             "\t.short %c1, %c2\n"                      \
+                             "\t.org 2b+%c3\n"                          \
+                             "\t.popsection"                            \
+                             : : "i" (__FILE__), "i" (__LINE__),        \
+                             "i" (0), "i" (sizeof(struct bug_entry)) ); \
+                for(;;) ;                                               \
+        } while(0)
+
+#else
+#define BUG()                                                           \
+        do {                                                            \
+                asm volatile(PARISC_BUG_BREAK_ASM : : );                \
+                for(;;) ;                                               \
+        } while(0)
+#endif
+
+#ifdef CONFIG_DEBUG_BUGVERBOSE
+#define __WARN()                                                        \
+        do {                                                            \
+                asm volatile("\n"                                       \
+                             "1:\t" PARISC_BUG_BREAK_ASM "\n"           \
+                             "\t.pushsection __bug_table,\"a\"\n"       \
+                             "2:\t" ASM_WORD_INSN "1b, %c0\n"           \
+                             "\t.short %c1, %c2\n"                      \
+                             "\t.org 2b+%c3\n"                          \
+                             "\t.popsection"                            \
+                             : : "i" (__FILE__), "i" (__LINE__),        \
+                             "i" (BUGFLAG_WARNING),                     \
+                             "i" (sizeof(struct bug_entry)) );          \
+        } while(0)
+#else
+#define __WARN()                                                        \
+        do {                                                            \
+                asm volatile("\n"                                       \
+                             "1:\t" PARISC_BUG_BREAK_ASM "\n"           \
+                             "\t.pushsection __bug_table,\"a\"\n"       \
+                             "2:\t" ASM_WORD_INSN "1b\n"                \
+                             "\t.short %c0\n"                           \
+                             "\t.org 2b+%c1\n"                          \
+                             "\t.popsection"                            \
+                             : : "i" (BUGFLAG_WARNING),                 \
+                             "i" (sizeof(struct bug_entry)) );          \
+        } while(0)
+#endif
+
+
+#define WARN_ON(x) ({                                           \
+        typeof(x) __ret_warn_on = (x);                          \
+        if (__builtin_constant_p(__ret_warn_on)) {              \
+                if (__ret_warn_on)                              \
+                        __WARN();                               \
+        } else {                                                \
+                if (unlikely(__ret_warn_on))                    \
+                        __WARN();                               \
+        }                                                       \
+        unlikely(__ret_warn_on);                                \
+})
+
 #endif
 
 #include <asm-generic/bug.h>
 #endif
+