mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-11 02:59:12 +00:00
powerpc/traps: fix recoverability of machine check handling on book3s/32
commit0bbea75c47
upstream. Looks like book3s/32 doesn't set RI on machine check, so checking RI before calling die() will always be fatal allthought this is not an issue in most cases. Fixes:b96672dd84
("powerpc: Machine check interrupt is a non-maskable interrupt") Fixes:daf00ae71d
("powerpc/traps: restore recoverability of machine_check interrupts") Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> Cc: stable@vger.kernel.org Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
baed68a953
commit
461a52a448
1 changed files with 4 additions and 4 deletions
|
@ -767,15 +767,15 @@ void machine_check_exception(struct pt_regs *regs)
|
|||
if (check_io_access(regs))
|
||||
goto bail;
|
||||
|
||||
/* Must die if the interrupt is not recoverable */
|
||||
if (!(regs->msr & MSR_RI))
|
||||
nmi_panic(regs, "Unrecoverable Machine check");
|
||||
|
||||
if (!nested)
|
||||
nmi_exit();
|
||||
|
||||
die("Machine check", regs, SIGBUS);
|
||||
|
||||
/* Must die if the interrupt is not recoverable */
|
||||
if (!(regs->msr & MSR_RI))
|
||||
nmi_panic(regs, "Unrecoverable Machine check");
|
||||
|
||||
return;
|
||||
|
||||
bail:
|
||||
|
|
Loading…
Reference in a new issue