---

yaml --- r: 8576 b: refs/heads/master c: b445221 h: refs/heads/master v: v3
git-mirror · Sep 12, 2005 · f1410e1 · f1410e1
1 parent 659a06d
commit f1410e1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70556463487f33bc6728a7596b97f86b811aad22
+refs/heads/master: b4452218c4b7a579056d439b73a668b71654c137
diff --git a/trunk/arch/x86_64/kernel/smpboot.c b/trunk/arch/x86_64/kernel/smpboot.c
@@ -413,8 +413,13 @@ void __cpuinit smp_callin(void)
 
 	/*
 	 * Get our bogomips.
+ 	 *
+ 	 * Need to enable IRQs because it can take longer and then
+	 * the NMI watchdog might kill us.
 	 */
+	local_irq_enable();
 	calibrate_delay();
+	local_irq_disable();
 	Dprintk("Stack at about %p\n",&cpuid);
 
 	disable_APIC_timer();