Commit a4caa18e authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar

x86: fix compiling when CONFIG_X86_MPPARSE is not set

Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 6695c85b
...@@ -307,7 +307,7 @@ if X86_GENERICARCH ...@@ -307,7 +307,7 @@ if X86_GENERICARCH
config X86_NUMAQ config X86_NUMAQ
bool "NUMAQ (IBM/Sequent)" bool "NUMAQ (IBM/Sequent)"
depends on SMP && X86_32 depends on SMP && X86_32 && X86_MPPARSE
select NUMA select NUMA
help help
This option is used for getting Linux to run on a NUMAQ (IBM/Sequent) This option is used for getting Linux to run on a NUMAQ (IBM/Sequent)
......
...@@ -56,18 +56,22 @@ static __init void early_get_boot_cpu_id(void) ...@@ -56,18 +56,22 @@ static __init void early_get_boot_cpu_id(void)
/* /*
* Find possible boot-time SMP configuration: * Find possible boot-time SMP configuration:
*/ */
#ifdef CONFIG_X86_MPPARSE
early_find_smp_config(); early_find_smp_config();
#endif
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI
/* /*
* Read APIC information from ACPI tables. * Read APIC information from ACPI tables.
*/ */
early_acpi_boot_init(); early_acpi_boot_init();
#endif #endif
#ifdef CONFIG_X86_MPPARSE
/* /*
* get boot-time SMP configuration: * get boot-time SMP configuration:
*/ */
if (smp_found_config) if (smp_found_config)
early_get_smp_config(); early_get_smp_config();
#endif
early_init_lapic_mapping(); early_init_lapic_mapping();
} }
......
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