Commit 0bbea75c authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman

powerpc/traps: fix recoverability of machine check handling on book3s/32

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: b96672dd ("powerpc: Machine check interrupt is a non-maskable interrupt")
Fixes: daf00ae7 ("powerpc/traps: restore recoverability of machine_check interrupts")
Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent ab44840d
...@@ -756,15 +756,15 @@ void machine_check_exception(struct pt_regs *regs) ...@@ -756,15 +756,15 @@ void machine_check_exception(struct pt_regs *regs)
if (check_io_access(regs)) if (check_io_access(regs))
goto bail; goto bail;
/* Must die if the interrupt is not recoverable */
if (!(regs->msr & MSR_RI))
nmi_panic(regs, "Unrecoverable Machine check");
if (!nested) if (!nested)
nmi_exit(); nmi_exit();
die("Machine check", regs, SIGBUS); 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; return;
bail: bail:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment