diff options
author | Alexey Starikovskiy <astarikovskiy@suse.de> | 2008-05-19 11:47:03 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2008-05-25 06:01:25 -0400 |
commit | bab4b27c00c4880737c18bb91138b1a7dd94164c (patch) | |
tree | 0a2fc200264e3ca89b4e87679b7fd76f866789c4 /arch/x86/kernel/mpparse.c | |
parent | f3918352909f839a7b0dbf9b3f81d2e183c46f88 (diff) |
x86: move smp_found_config
Diffstat (limited to 'arch/x86/kernel/mpparse.c')
-rw-r--r-- | arch/x86/kernel/mpparse.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c index b72c04602ad2..d67cd7600a21 100644 --- a/arch/x86/kernel/mpparse.c +++ b/arch/x86/kernel/mpparse.c | |||
@@ -32,9 +32,6 @@ | |||
32 | #include <mach_mpparse.h> | 32 | #include <mach_mpparse.h> |
33 | #endif | 33 | #endif |
34 | 34 | ||
35 | /* Have we found an MP table */ | ||
36 | int smp_found_config; | ||
37 | |||
38 | /* | 35 | /* |
39 | * Various Linux-internal data structures created from the | 36 | * Various Linux-internal data structures created from the |
40 | * MP-table. | 37 | * MP-table. |
@@ -639,7 +636,9 @@ static void __init __get_smp_config(unsigned early) | |||
639 | * override the defaults. | 636 | * override the defaults. |
640 | */ | 637 | */ |
641 | if (!smp_read_mpc(phys_to_virt(mpf->mpf_physptr), early)) { | 638 | if (!smp_read_mpc(phys_to_virt(mpf->mpf_physptr), early)) { |
639 | #ifdef CONFIG_X86_LOCAL_APIC | ||
642 | smp_found_config = 0; | 640 | smp_found_config = 0; |
641 | #endif | ||
643 | printk(KERN_ERR | 642 | printk(KERN_ERR |
644 | "BIOS bug, MP table errors detected!...\n"); | 643 | "BIOS bug, MP table errors detected!...\n"); |
645 | printk(KERN_ERR "... disabling SMP support. " | 644 | printk(KERN_ERR "... disabling SMP support. " |
@@ -706,8 +705,9 @@ static int __init smp_scan_config(unsigned long base, unsigned long length, | |||
706 | !mpf_checksum((unsigned char *)bp, 16) && | 705 | !mpf_checksum((unsigned char *)bp, 16) && |
707 | ((mpf->mpf_specification == 1) | 706 | ((mpf->mpf_specification == 1) |
708 | || (mpf->mpf_specification == 4))) { | 707 | || (mpf->mpf_specification == 4))) { |
709 | 708 | #ifdef CONFIG_X86_LOCAL_APIC | |
710 | smp_found_config = 1; | 709 | smp_found_config = 1; |
710 | #endif | ||
711 | mpf_found = mpf; | 711 | mpf_found = mpf; |
712 | #ifdef CONFIG_X86_32 | 712 | #ifdef CONFIG_X86_32 |
713 | printk(KERN_INFO "found SMP MP-table at [%p] %08lx\n", | 713 | printk(KERN_INFO "found SMP MP-table at [%p] %08lx\n", |