powerpc/traps: restore recoverability of machine_check interrupts
authorChristophe Leroy <christophe.leroy@c-s.fr>
Sat, 13 Oct 2018 09:16:22 +0000 (09:16 +0000)
committerMichael Ellerman <mpe@ellerman.id.au>
Sat, 20 Oct 2018 02:26:47 +0000 (13:26 +1100)
commitdaf00ae71dad8aa05965713c62558aeebf2df48e
treeedbe832761588a0b06835ec2e612bb5fa6a61b3c
parentb851ba02a6f3075f0f99c60c4bc30a4af80cf428
powerpc/traps: restore recoverability of machine_check interrupts

commit b96672dd840f ("powerpc: Machine check interrupt is a non-
maskable interrupt") added a call to nmi_enter() at the beginning of
machine check restart exception handler. Due to that, in_interrupt()
always returns true regardless of the state before entering the
exception, and die() panics even when the system was not already in
interrupt.

This patch calls nmi_exit() before calling die() in order to restore
the interrupt state we had before calling nmi_enter()

Fixes: b96672dd840f ("powerpc: Machine check interrupt is a non-maskable interrupt")
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Reviewed-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/kernel/traps.c