From f1410e1f2835d31a481693f535ba9a2c423ccce6 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Mon, 12 Sep 2005 18:49:24 +0200
Subject: [PATCH] --- yaml --- r: 8576 b: refs/heads/master c:
 b4452218c4b7a579056d439b73a668b71654c137 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/arch/x86_64/kernel/smpboot.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5f5134edbe1b..b2cc011ed655 100644
--- 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
index 4efe36fe99aa..277ce5e91e04 100644
--- 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();