Skip to content

Commit

Permalink
MIPS: Call oops_enter, oops_exit in die
Browse files Browse the repository at this point in the history
This allows pause_on_oops and mtdoops to work.

Signed-off-by: Nathan Lynch <[email protected]>
To: [email protected]
Patchwork: https://patchwork.linux-mips.org/patch/2810/
Signed-off-by: Ralf Baechle <[email protected]>
  • Loading branch information
nathanlynch authored and ralfbaechle committed Oct 1, 2011
1 parent a4be637 commit 8742cd2
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion arch/mips/kernel/traps.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include <linux/bug.h>
#include <linux/compiler.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/mm.h>
#include <linux/module.h>
#include <linux/sched.h>
Expand Down Expand Up @@ -371,14 +372,19 @@ void __noreturn die(const char *str, struct pt_regs *regs)
static int die_counter;
int sig = SIGSEGV;
#ifdef CONFIG_MIPS_MT_SMTC
unsigned long dvpret = dvpe();
unsigned long dvpret;
#endif /* CONFIG_MIPS_MT_SMTC */

oops_enter();

if (notify_die(DIE_OOPS, str, regs, 0, regs_to_trapnr(regs), SIGSEGV) == NOTIFY_STOP)
sig = 0;

console_verbose();
raw_spin_lock_irq(&die_lock);
#ifdef CONFIG_MIPS_MT_SMTC
dvpret = dvpe();
#endif /* CONFIG_MIPS_MT_SMTC */
bust_spinlocks(1);
#ifdef CONFIG_MIPS_MT_SMTC
mips_mt_regdump(dvpret);
Expand All @@ -389,6 +395,8 @@ void __noreturn die(const char *str, struct pt_regs *regs)
add_taint(TAINT_DIE);
raw_spin_unlock_irq(&die_lock);

oops_exit();

if (in_interrupt())
panic("Fatal exception in interrupt");

Expand Down

0 comments on commit 8742cd2

Please sign in to comment.