diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-08-22 03:49:58 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-22 03:49:58 +0900 |
| commit | c153a58e715e16ffcd6c4b3da7fc6b4a556bf917 (patch) | |
| tree | 89639b00047f341f5ebf0b2029a861e3718f641f /arch/sh/kernel/traps.c | |
| parent | 4ab8f241f6d510470c15b62ac10f6905ff5c97bd (diff) | |
| parent | 5580e9044df9c0e87861739d8c527006ead92e52 (diff) | |
| download | talos-obmc-linux-c153a58e715e16ffcd6c4b3da7fc6b4a556bf917.tar.gz talos-obmc-linux-c153a58e715e16ffcd6c4b3da7fc6b4a556bf917.zip | |
Merge branch 'sh/dwarf-unwinder' of git://github.com/mfleming/linux-2.6 into sh/dwarf-unwinder
Diffstat (limited to 'arch/sh/kernel/traps.c')
| -rw-r--r-- | arch/sh/kernel/traps.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c index b3e0067db358..881b9a32b7de 100644 --- a/arch/sh/kernel/traps.c +++ b/arch/sh/kernel/traps.c @@ -8,7 +8,7 @@ #include <asm/system.h> #ifdef CONFIG_BUG -static void handle_BUG(struct pt_regs *regs) +void handle_BUG(struct pt_regs *regs) { enum bug_trap_type tt; tt = report_bug(regs->pc, regs); @@ -29,7 +29,10 @@ int is_valid_bugaddr(unsigned long addr) if (probe_kernel_address((insn_size_t *)addr, opcode)) return 0; - return opcode == TRAPA_BUG_OPCODE; + if (opcode == TRAPA_BUG_OPCODE || opcode == TRAPA_UNWINDER_BUG_OPCODE) + return 1; + + return 0; } #endif |
