From cfa07ddde1b646f980a3fc66a8133d9d95401e1a Mon Sep 17 00:00:00 2001
From: Andi Kleen <andi@firstfloor.org>
Date: Wed, 27 May 2009 21:56:53 +0200
Subject: [PATCH] --- yaml --- r: 148917 b: refs/heads/master c:
 de8a84d85ad8bb46d01d72ebc57030b95075603c h: refs/heads/master i:   148915:
 2872559f8eb2d8185f28fc28b19ee924b0f7f993 v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/x86/kernel/cpu/mcheck/mce.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 180f7801f470..7cc3d12d4e10 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ee08347c1e8b5680b3b3ce081e42e97bcaa1abe
+refs/heads/master: de8a84d85ad8bb46d01d72ebc57030b95075603c
diff --git a/trunk/arch/x86/kernel/cpu/mcheck/mce.c b/trunk/arch/x86/kernel/cpu/mcheck/mce.c
index ba68449c22a1..86806e52fc40 100644
--- a/trunk/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/trunk/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;
 
 		/*