Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[~shefty/rdma-dev.git] / arch / x86 / kernel / smpboot.c

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 5104a2b685cf4b5a538d451cecc694bdf6427285..ce13315d48fb73d9d55f8344e99e6c50bbe168db 100644 (file)
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -219,14 +219,9 @@ static void __cpuinit smp_callin(void)
         * Update loops_per_jiffy in cpu_data. Previous call to
         * smp_store_cpu_info() stored a value that is close but not as
         * accurate as the value just calculated.
         * Update loops_per_jiffy in cpu_data. Previous call to
         * smp_store_cpu_info() stored a value that is close but not as
         * accurate as the value just calculated.

-        *
-        * Need to enable IRQs because it can take longer and then
-        * the NMI watchdog might kill us.

         */
         */

-       local_irq_enable();

        calibrate_delay();
        cpu_data(cpuid).loops_per_jiffy = loops_per_jiffy;
        calibrate_delay();
        cpu_data(cpuid).loops_per_jiffy = loops_per_jiffy;

-       local_irq_disable();

        pr_debug("Stack at about %p\n", &cpuid);
 
        /*
        pr_debug("Stack at about %p\n", &cpuid);
 
        /*