x86: fix compiling when CONFIG_X86_MPPARSE is not set

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

2 files changed, 5 insertions, 1 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 0804a889c27b..25251799337f 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -307,7 +307,7 @@ if X86_GENERICARCH
 
 config X86_NUMAQ
         bool "NUMAQ (IBM/Sequent)"
-        depends on SMP && X86_32
+        depends on SMP && X86_32 && X86_MPPARSE
         select NUMA
         help
           This option is used for getting Linux to run on a NUMAQ (IBM/Sequent)
diff --git a/arch/x86/mm/k8topology_64.c b/arch/x86/mm/k8topology_64.c
index 1f476e477844..f75aa2ae54a3 100644
--- a/arch/x86/mm/k8topology_64.c
+++ b/arch/x86/mm/k8topology_64.c
@@ -56,18 +56,22 @@ static __init void early_get_boot_cpu_id(void)
         /*
          * Find possible boot-time SMP configuration:
          */
+#ifdef CONFIG_X86_MPPARSE
         early_find_smp_config();
+#endif
 #ifdef CONFIG_ACPI
         /*
          * Read APIC information from ACPI tables.
          */
         early_acpi_boot_init();
 #endif
+#ifdef CONFIG_X86_MPPARSE
         /*
          * get boot-time SMP configuration:
          */
         if (smp_found_config)
                 early_get_smp_config();
+#endif
         early_init_lapic_mapping();
 }