Commit 107ce721 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds

[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: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f18de453
...@@ -304,8 +304,6 @@ static void __init smp_callin(void) ...@@ -304,8 +304,6 @@ static void __init smp_callin(void)
Dprintk("CALLIN, before setup_local_APIC().\n"); Dprintk("CALLIN, before setup_local_APIC().\n");
setup_local_APIC(); setup_local_APIC();
local_irq_enable();
/* /*
* Get our bogomips. * Get our bogomips.
*/ */
...@@ -319,8 +317,6 @@ static void __init smp_callin(void) ...@@ -319,8 +317,6 @@ static void __init smp_callin(void)
*/ */
smp_store_cpu_info(cpuid); smp_store_cpu_info(cpuid);
local_irq_disable();
/* /*
* Allow the master to continue. * Allow the master to continue.
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment