Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

[pandora-kernel.git] / arch / sh / kernel / traps.c

diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c
index 3762d9d..e9f168f 100644 (file)
--- a/arch/sh/kernel/traps.c
+++ b/arch/sh/kernel/traps.c
@@ -19,6 +19,7 @@
 #include <linux/kallsyms.h>
 #include <linux/io.h>
 #include <linux/debug_locks.h>
+#include <linux/limits.h>
 #include <asm/system.h>
 #include <asm/uaccess.h>
 
@@ -129,6 +130,40 @@ 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
@@ -606,7 +641,7 @@ int is_dsp_inst(struct pt_regs *regs)
         * Safe guard if DSP mode is already enabled or we're lacking
         * the DSP altogether.
         */
-       if (!(cpu_data->flags & CPU_HAS_DSP) || (regs->sr & SR_DSP))
+       if (!(current_cpu_data.flags & CPU_HAS_DSP) || (regs->sr & SR_DSP))
                return 0;
 
        get_user(inst, ((unsigned short *) regs->pc));