1 files changed, 10 insertions, 0 deletions

diff --git a/arch/sh/kernel/process.c b/arch/sh/kernel/process.c
index f3e2631be144..7347f6afa030 100644
--- a/arch/sh/kernel/process.c
+++ b/arch/sh/kernel/process.c
@@ -498,6 +498,16 @@ asmlinkage void break_point_trap_software(unsigned long r4, unsigned long r5,
 {
         struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
 
+        /* Rewind */
         regs->pc -= 2;
+
+#ifdef CONFIG_BUG
+        if (__kernel_text_address(instruction_pointer(regs))) {
+                u16 insn = *(u16 *)instruction_pointer(regs);
+                if (insn == TRAPA_BUG_OPCODE)
+                        handle_BUG(regs);
+        }
+#endif
+
         force_sig(SIGTRAP, current);
 }