From ac5c4a5d560ad7a5781f3315010c0b301877ab5e Mon Sep 17 00:00:00 2001
From: Andi Kleen <andi@firstfloor.org>
Date: Wed, 27 May 2009 21:56:51 +0200
Subject: [PATCH] --- yaml --- r: 148895 b: refs/heads/master c:
 88921be30296e126896ee4d30758f989d1c4ddfb h: refs/heads/master i:   148893:
 df7137b49f798bd8b6b5f538fc0889662451f294   148891:
 550801b307f0d91df8b1d7d90e3e200998c4b959   148887:
 69d6f58fa992dd443ac76ad19c622024d6ed96e8   148879:
 be39723beda216f9089b538c23dd2511089c1dac   148863:
 b17331045770b3bb09955f2fe60cc70aebed9b74 v: v3

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

diff --git a/[refs] b/[refs]
index 9ad1bc795f23..030e347c7b50 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5706001aacba5d3db5f224ca135e5e91a30be39c
+refs/heads/master: 88921be30296e126896ee4d30758f989d1c4ddfb
diff --git a/trunk/arch/x86/kernel/cpu/mcheck/mce.c b/trunk/arch/x86/kernel/cpu/mcheck/mce.c
index 156cdf6d9181..495c96808668 100644
--- a/trunk/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/trunk/arch/x86/kernel/cpu/mcheck/mce.c
@@ -328,6 +328,8 @@ void machine_check_poll(enum mcp_flags flags, mce_banks_t *b)
 	 * Don't clear MCG_STATUS here because it's only defined for
 	 * exceptions.
 	 */
+
+	sync_core();
 }
 EXPORT_SYMBOL_GPL(machine_check_poll);
 
@@ -501,6 +503,7 @@ void do_machine_check(struct pt_regs *regs, long error_code)
 	mce_wrmsrl(MSR_IA32_MCG_STATUS, 0);
  out2:
 	atomic_dec(&mce_entry);
+	sync_core();
 }
 EXPORT_SYMBOL_GPL(do_machine_check);