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

[pandora-kernel.git] / 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 (file)
--- a/arch/x86_64/kernel/smpboot.c
+++ b/arch/x86_64/kernel/smpboot.c
@@ -413,8 +413,13 @@ void __cpuinit smp_callin(void)
 
        /*
         * Get our bogomips.
 
        /*
         * 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();
        calibrate_delay();

+       local_irq_disable();

        Dprintk("Stack at about %p\n",&cpuid);
 
        disable_APIC_timer();
        Dprintk("Stack at about %p\n",&cpuid);
 
        disable_APIC_timer();