---

yaml --- r: 148895 b: refs/heads/master c: 88921be h: refs/heads/master i: 148893: df7137b 148891: 550801b 148887: 69d6f58 148879: be39723 148863: b173310 v: v3
git-mirror · May 28, 2009 · ac5c4a5 · ac5c4a5
1 parent f88e530
commit ac5c4a5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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);