aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2008-10-21 05:33:36 -0400
committerPaul Mundt <lethal@linux-sh.org>2008-10-21 05:33:36 -0400
commitc9306f0efbfbe65a6e9212082f1d1fc19fdc3094 (patch)
tree361c57214853d1b84f509da086cdf3692d776087 /arch/sh
parentf7141d5884828f733cf9d13ed693135954b0c189 (diff)
sh: Wire up oops reporting in the die notifier chain.
Commit 3f5a54e371ca20b119b73704f6c01b71295c1714 ("ftrace: dump out ftrace buffers to console on panic") added an ftrace buffer dumper that hooks in to the die notifier chain and dumps out data in the oops path. Unfortunately SH supported ftrace but didn't support DIE_OOPS, so add that in and get it building again. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/include/asm/kdebug.h1
-rw-r--r--arch/sh/kernel/traps_32.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/sh/include/asm/kdebug.h b/arch/sh/include/asm/kdebug.h
index 49cd69051a88..0b9f896f203c 100644
--- a/arch/sh/include/asm/kdebug.h
+++ b/arch/sh/include/asm/kdebug.h
@@ -4,6 +4,7 @@
4/* Grossly misnamed. */ 4/* Grossly misnamed. */
5enum die_val { 5enum die_val {
6 DIE_TRAP, 6 DIE_TRAP,
7 DIE_OOPS,
7}; 8};
8 9
9#endif /* __ASM_SH_KDEBUG_H */ 10#endif /* __ASM_SH_KDEBUG_H */
diff --git a/arch/sh/kernel/traps_32.c b/arch/sh/kernel/traps_32.c
index b359b08a8e33..1e5c74efbacc 100644
--- a/arch/sh/kernel/traps_32.c
+++ b/arch/sh/kernel/traps_32.c
@@ -105,6 +105,8 @@ void die(const char * str, struct pt_regs * regs, long err)
105 dump_mem("Stack: ", regs->regs[15], THREAD_SIZE + 105 dump_mem("Stack: ", regs->regs[15], THREAD_SIZE +
106 (unsigned long)task_stack_page(current)); 106 (unsigned long)task_stack_page(current));
107 107
108 notify_die(DIE_OOPS, str, regs, err, 255, SIGSEGV);
109
108 bust_spinlocks(0); 110 bust_spinlocks(0);
109 add_taint(TAINT_DIE); 111 add_taint(TAINT_DIE);
110 spin_unlock_irq(&die_lock); 112 spin_unlock_irq(&die_lock);