Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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)

arch/x86/mm/k8topology_64.c

+4 −0
Original line number Diff line number Diff line
@@ -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();

}