sh: generic BUG() support.

Wire up GENERIC_BUG for SH. This moves off of the special bug
frame and on to the generic struct bug_entry. Roughly the same
semantics are retained, and we can kill off some of the verbose
BUG() reporting code.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

1 files changed, 20 insertions, 34 deletions

diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c
index e9f168f60f95..77107838271f 100644
--- a/arch/sh/kernel/traps.c
+++ b/arch/sh/kernel/traps.c
@@ -18,6 +18,7 @@
 #include <linux/module.h>
 #include <linux/kallsyms.h>
 #include <linux/io.h>
+#include <linux/bug.h>
 #include <linux/debug_locks.h>
 #include <linux/limits.h>
 #include <asm/system.h>
@@ -130,40 +131,6 @@ static int die_if_no_fixup(const char * str, struct pt_regs * regs, long err)
         return -EFAULT;
 }
 
-#ifdef CONFIG_BUG
-#ifdef CONFIG_DEBUG_BUGVERBOSE
-static inline void do_bug_verbose(struct pt_regs *regs)
-{
-        struct bug_frame f;
-        long len;
-
-        if (__copy_from_user(&f, (const void __user *)regs->pc,
-                             sizeof(struct bug_frame)))
-                return;
-
-        len = __strnlen_user(f.file, PATH_MAX) - 1;
-        if (unlikely(len < 0 || len >= PATH_MAX))
-                f.file = "<bad filename>";
-        len = __strnlen_user(f.func, PATH_MAX) - 1;
-        if (unlikely(len < 0 || len >= PATH_MAX))
-                f.func = "<bad function>";
-
-        printk(KERN_ALERT "kernel BUG in %s() at %s:%d!\n",
-               f.func, f.file, f.line);
-}
-#else
-static inline void do_bug_verbose(struct pt_regs *regs)
-{
-}
-#endif /* CONFIG_DEBUG_BUGVERBOSE */
-
-void handle_BUG(struct pt_regs *regs)
-{
-        do_bug_verbose(regs);
-        die("Kernel BUG", regs, TRAPA_BUG_OPCODE & 0xff);
-}
-#endif /* CONFIG_BUG */
-
 /*
  * handle an instruction that does an unaligned memory access by emulating the
  * desired behaviour
@@ -888,6 +855,25 @@ void __init trap_init(void)
         per_cpu_trap_init();
 }
 
+#ifdef CONFIG_BUG
+void handle_BUG(struct pt_regs *regs)
+{
+        enum bug_trap_type tt;
+        tt = report_bug(regs->pc);
+        if (tt == BUG_TRAP_TYPE_WARN) {
+                regs->pc += 2;
+                return;
+        }
+
+        die("Kernel BUG", regs, TRAPA_BUG_OPCODE & 0xff);
+}
+
+int is_valid_bugaddr(unsigned long addr)
+{
+        return addr >= PAGE_OFFSET;
+}
+#endif
+
 void show_trace(struct task_struct *tsk, unsigned long *sp,
                 struct pt_regs *regs)
 {