1 files changed, 2 insertions, 2 deletions

diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index ba68449c22a1..86806e52fc40 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -412,9 +412,9 @@ void do_machine_check(struct pt_regs *regs, long error_code)
 
                 /*
                  * Non uncorrected errors are handled by machine_check_poll
-                 * Leave them alone.
+                 * Leave them alone, unless this panics.
                  */
-                if ((m.status & MCI_STATUS_UC) == 0)
+                if ((m.status & MCI_STATUS_UC) == 0 && !no_way_out)
                         continue;
 
                 /*