commit b4452218c4b7a579056d439b73a668b71654c137
author Andi Kleen <ak@suse.de> Mon Sep 12 18:49:24 2005 +0200
committer Linus Torvalds <torvalds@g5.osdl.org> Mon Sep 12 10:49:55 2005 -0700
tree a83d03b2bfc5a33a2f89a3d6b677b764ea3ac183
parent 70556463487f33bc6728a7596b97f86b811aad22

[PATCH] x86-64: Enable interrupts during delay calibration on APs

We used to disable them to work around a bug, but that
is not needed anymore. Keeping them enabled avoids the NMI
watchdog triggering in some cases.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

arch/x86_64/kernel/smpboot.c

diff --git a/arch/x86_64/kernel/smpboot.c b/arch/x86_64/kernel/smpboot.c
index 4efe36f..277ce5e 100644
--- a/arch/x86_64/kernel/smpboot.c
+++ b/arch/x86_64/kernel/smpboot.c
@@ -413,8 +413,13 @@
 
 	/*
 	 * 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();