---

yaml --- r: 120757 b: refs/heads/master c: 4e03043 h: refs/heads/master i: 120755: a061d7a v: v3
git-mirror · Nov 10, 2008 · 2dbb007 · 2dbb007
1 parent 961e255
commit 2dbb007
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ecd33d930591d41fe356160593a9076467b961c
+refs/heads/master: 4e0304310f5180eee11b4edc72cf4cb78acdc634
diff --git a/trunk/arch/x86/kernel/apic.c b/trunk/arch/x86/kernel/apic.c
@@ -672,13 +672,9 @@ static int __init calibrate_APIC_clock(void)
 		while (lapic_cal_loops <= LAPIC_CAL_LOOPS)
 			cpu_relax();
 
-		local_irq_disable();
-
 		/* Stop the lapic timer */
 		lapic_timer_setup(CLOCK_EVT_MODE_SHUTDOWN, levt);
 
-		local_irq_enable();
-
 		/* Jiffies delta */
 		deltaj = lapic_cal_j2 - lapic_cal_j1;
 		apic_printk(APIC_VERBOSE, "... jiffies delta = %lu\n", deltaj);