---

yaml --- r: 88835 b: refs/heads/master c: e481fcf h: refs/heads/master i: 88833: 5a26304 88831: 1c4cf3a v: v3
git-mirror · Apr 17, 2008 · 0220f5f · 0220f5f
1 parent 1902fb0
commit 0220f5f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac60aae561fff99d38beba82d84277b12437c05e
+refs/heads/master: e481fcf8563d300e7f8875cae5fdc41941d29de0
diff --git a/trunk/arch/x86/kernel/smpboot_32.c b/trunk/arch/x86/kernel/smpboot_32.c
@@ -167,7 +167,9 @@ static void __cpuinit smp_callin(void)
 	/*
 	 * Get our bogomips.
 	 */
+	local_irq_enable();
 	calibrate_delay();
+	local_irq_disable();
 	Dprintk("Stack at about %p\n",&cpuid);
 
 	/*