Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55273982 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: oops_enter()/oops_exit() in die(). 

As Russell helpfully pointed out on linux-arch:

	http://marc.info/?l=linux-arch&m=118208089204630&w=2



We were missing the oops_enter/exit() in the sh die() implementation.
As we do support lockdep, it's beneficial to add these calls so lockdep
properly disables itself in the die() case.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 69a33147

arch/sh/kernel/traps.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -83,6 +83,8 @@ void die(const char * str, struct pt_regs * regs, long err) 
{

{

	static int die_counter;

	static int die_counter;





	oops_enter();



	console_verbose();

	console_verbose();

	spin_lock_irq(&die_lock);

	spin_lock_irq(&die_lock);

	bust_spinlocks(1);

	bust_spinlocks(1);
@@ -112,6 +114,7 @@ void die(const char * str, struct pt_regs * regs, long err) 
	if (panic_on_oops)

	if (panic_on_oops)

		panic("Fatal exception");

		panic("Fatal exception");





	oops_exit();

	do_exit(SIGSEGV);

	do_exit(SIGSEGV);

}

}