---

yaml --- r: 138642 b: refs/heads/master c: f9695df h: refs/heads/master v: v3
git-mirror · Feb 24, 2009 · 8dd6a4d · 8dd6a4d
1 parent a17e12b
commit 8dd6a4d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b276268631af3a1b0df871e10d19d492f0513d4b
+refs/heads/master: f9695df42cdbca78530b4458c38ecfdd0bb90079
diff --git a/trunk/arch/x86/kernel/cpu/mcheck/threshold.c b/trunk/arch/x86/kernel/cpu/mcheck/threshold.c
@@ -15,10 +15,11 @@ void (*mce_threshold_vector)(void) = default_threshold_interrupt;
 
 asmlinkage void mce_threshold_interrupt(void)
 {
-	ack_APIC_irq();
 	exit_idle();
 	irq_enter();
 	inc_irq_stat(irq_threshold_count);
 	mce_threshold_vector();
 	irq_exit();
+	/* Ack only at the end to avoid potential reentry */
+	ack_APIC_irq();
 }