[PATCH] x86_64: disable interrupts during SMP bogomips checking

Port over a i386 kludge from rusty to x86-64

I don't think it is a full solution, but the upcomming smp bootup rewrite
will solve it.

This fixes BUGs at bootup on bigger x86-64 systems.

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

1 files changed, 0 insertions, 4 deletions

diff --git a/arch/x86_64/kernel/smpboot.c b/arch/x86_64/kernel/smpboot.c
index afd3600b919e..e5714090b00d 100644
--- a/arch/x86_64/kernel/smpboot.c
+++ b/arch/x86_64/kernel/smpboot.c
@@ -304,8 +304,6 @@ static void __init smp_callin(void)
         Dprintk("CALLIN, before setup_local_APIC().\n");
         setup_local_APIC();
 
-        local_irq_enable();
-
         /*
          * Get our bogomips.
          */
@@ -319,8 +317,6 @@ static void __init smp_callin(void)
          */
         smp_store_cpu_info(cpuid);
 
-        local_irq_disable();
-
         /*
          * Allow the master to continue.
          */