Commit 8742cd23 authored by Nathan Lynch's avatar Nathan Lynch Committed by Ralf Baechle
Browse files

MIPS: Call oops_enter, oops_exit in die 



This allows pause_on_oops and mtdoops to work.

Signed-off-by: default avatarNathan Lynch <ntl@pobox.com>
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2810/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent a4be637b

arch/mips/kernel/traps.c

+9 −1
Original line number Diff line number Diff line
@@ -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>
@@ -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);
@@ -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");