---

yaml --- r: 138648 b: refs/heads/master c: 5ca8681 h: refs/heads/master v: v3
git-mirror · Feb 24, 2009 · 8d2e262 · 8d2e262
1 parent 9fecad7
commit 8d2e262
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df20e2eb3e59b8625021a1bc8b1b53a4edc6008b
+refs/heads/master: 5ca8681ca10f671427710f4954644359856581a3
diff --git a/trunk/arch/x86/kernel/apic.c b/trunk/arch/x86/kernel/apic.c
@@ -868,6 +868,14 @@ void clear_local_APIC(void)
 		apic_write(APIC_LVTTHMR, v | APIC_LVT_MASKED);
 	}
 #endif
+#ifdef CONFIG_X86_MCE_INTEL
+	if (maxlvt >= 6) {
+		v = apic_read(APIC_LVTCMCI);
+		if (!(v & APIC_LVT_MASKED))
+			apic_write(APIC_LVTCMCI, v | APIC_LVT_MASKED);
+	}
+#endif
+
 	/*
 	 * Clean APIC state for other OSs:
 	 */