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

Commit 7458e8b2 authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman
Browse files

powerpc: Fix second nested oops hang 



When ending an oops, don't clear die_owner unless the nest count
went to zero. This prevents a second nested oops from hanging forever
on the die_lock.

Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 6f44b20e

arch/powerpc/kernel/traps.c

+3 −2
Original line number Diff line number Diff line
@@ -147,14 +147,15 @@ static void oops_end(unsigned long flags, struct pt_regs *regs, 
			       int signr)

{

	bust_spinlocks(0);

	die_owner = -1;

	add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);

	die_nest_count--;

	oops_exit();

	printk("\n");

	if (!die_nest_count)

	if (!die_nest_count) {

		/* Nest count reaches zero, release the lock. */

		die_owner = -1;

		arch_spin_unlock(&die_lock);

	}

	raw_local_irq_restore(flags);



	crash_fadump(regs, "die oops");