diff options
Diffstat (limited to 'arch/powerpc/kernel/traps.c')
| -rw-r--r-- | arch/powerpc/kernel/traps.c | 8 | 
1 files changed, 4 insertions, 4 deletions
| diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index 11741703d26e..a08bb7cefdc5 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c @@ -245,7 +245,7 @@ static void oops_end(unsigned long flags, struct pt_regs *regs,  	if (panic_on_oops)  		panic("Fatal exception"); -	do_exit(signr); +	make_task_dead(signr);  }  NOKPROBE_SYMBOL(oops_end); @@ -792,9 +792,9 @@ int machine_check_generic(struct pt_regs *regs)  void die_mce(const char *str, struct pt_regs *regs, long err)  {  	/* -	 * The machine check wants to kill the interrupted context, but -	 * do_exit() checks for in_interrupt() and panics in that case, so -	 * exit the irq/nmi before calling die. +	 * The machine check wants to kill the interrupted context, +	 * but make_task_dead() checks for in_interrupt() and panics +	 * in that case, so exit the irq/nmi before calling die.  	 */  	if (in_nmi())  		nmi_exit(); |