diff options
| -rw-r--r-- | arch/mips/kernel/traps.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c index 71350f7f2d88..e9b3af27d844 100644 --- a/arch/mips/kernel/traps.c +++ b/arch/mips/kernel/traps.c | |||
| @@ -374,7 +374,8 @@ void __noreturn die(const char *str, struct pt_regs *regs) | |||
| 374 | unsigned long dvpret = dvpe(); | 374 | unsigned long dvpret = dvpe(); |
| 375 | #endif /* CONFIG_MIPS_MT_SMTC */ | 375 | #endif /* CONFIG_MIPS_MT_SMTC */ |
| 376 | 376 | ||
| 377 | notify_die(DIE_OOPS, str, regs, 0, regs_to_trapnr(regs), SIGSEGV); | 377 | if (notify_die(DIE_OOPS, str, regs, 0, regs_to_trapnr(regs), SIGSEGV) == NOTIFY_STOP) |
| 378 | sig = 0; | ||
| 378 | 379 | ||
| 379 | console_verbose(); | 380 | console_verbose(); |
| 380 | spin_lock_irq(&die_lock); | 381 | spin_lock_irq(&die_lock); |
| @@ -383,9 +384,6 @@ void __noreturn die(const char *str, struct pt_regs *regs) | |||
| 383 | mips_mt_regdump(dvpret); | 384 | mips_mt_regdump(dvpret); |
| 384 | #endif /* CONFIG_MIPS_MT_SMTC */ | 385 | #endif /* CONFIG_MIPS_MT_SMTC */ |
| 385 | 386 | ||
| 386 | if (notify_die(DIE_OOPS, str, regs, 0, regs_to_trapnr(regs), SIGSEGV) == NOTIFY_STOP) | ||
| 387 | sig = 0; | ||
| 388 | |||
| 389 | printk("%s[#%d]:\n", str, ++die_counter); | 387 | printk("%s[#%d]:\n", str, ++die_counter); |
| 390 | show_registers(regs); | 388 | show_registers(regs); |
| 391 | add_taint(TAINT_DIE); | 389 | add_taint(TAINT_DIE); |
