1 files changed, 7 insertions, 2 deletions

diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index f1629a8acc4b..47904cd1ff46 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -763,12 +763,17 @@ void machine_check_exception(struct pt_regs *regs)
         if (check_io_access(regs))
                 goto bail;
 
-        die("Machine check", regs, SIGBUS);
-
         /* 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);
+
+        return;
+
 bail:
         if (!nested)
                 nmi_exit();