From 572ee48d5edcc3dc6a8fda48a7e8c73d40c87a8a Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Tue, 21 Oct 2008 18:33:36 +0900 Subject: [PATCH] --- yaml --- r: 117257 b: refs/heads/master c: c9306f0efbfbe65a6e9212082f1d1fc19fdc3094 h: refs/heads/master i: 117255: c0510b8b7ef8c0022aa440a498cf99a432ac97fe v: v3 --- [refs] | 2 +- trunk/arch/sh/include/asm/kdebug.h | 1 + trunk/arch/sh/kernel/traps_32.c | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4d3427a9b795..3eda25906e4d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f7141d5884828f733cf9d13ed693135954b0c189 +refs/heads/master: c9306f0efbfbe65a6e9212082f1d1fc19fdc3094 diff --git a/trunk/arch/sh/include/asm/kdebug.h b/trunk/arch/sh/include/asm/kdebug.h index 49cd69051a88..0b9f896f203c 100644 --- a/trunk/arch/sh/include/asm/kdebug.h +++ b/trunk/arch/sh/include/asm/kdebug.h @@ -4,6 +4,7 @@ /* Grossly misnamed. */ enum die_val { DIE_TRAP, + DIE_OOPS, }; #endif /* __ASM_SH_KDEBUG_H */ diff --git a/trunk/arch/sh/kernel/traps_32.c b/trunk/arch/sh/kernel/traps_32.c index b359b08a8e33..1e5c74efbacc 100644 --- a/trunk/arch/sh/kernel/traps_32.c +++ b/trunk/arch/sh/kernel/traps_32.c @@ -105,6 +105,8 @@ void die(const char * str, struct pt_regs * regs, long err) dump_mem("Stack: ", regs->regs[15], THREAD_SIZE + (unsigned long)task_stack_page(current)); + notify_die(DIE_OOPS, str, regs, err, 255, SIGSEGV); + bust_spinlocks(0); add_taint(TAINT_DIE); spin_unlock_irq(&die_lock);