Selaa lähdekoodia

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>
Yinghai Lu 17 vuotta sitten
vanhempi
commit
a4caa18efe
2 muutettua tiedostoa jossa 5 lisäystä ja 1 poistoa
  1. 1 1
      arch/x86/Kconfig
  2. 4 0
      arch/x86/mm/k8topology_64.c

+ 1 - 1
arch/x86/Kconfig

@@ -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)

+ 4 - 0
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:
 	 * 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();
 }
 }