Commit d1b20afe authored Jun 25, 2008 by Yinghai Lu Committed by Ingo Molnar Jul 08, 2008

x86: make x86_find_smp_config depends on 64 bit too



Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent 0196bcbb

arch/x86/Kconfig

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -233,7 +233,6 @@ config SMP
	config X86_FIND_SMP_CONFIG		config X86_FIND_SMP_CONFIG
	def_bool y		def_bool y
	depends on X86_MPPARSE \|\| X86_VOYAGER \|\| X86_VISWS		depends on X86_MPPARSE \|\| X86_VOYAGER \|\| X86_VISWS
	depends on X86_32

	if ACPI		if ACPI
	config X86_MPPARSE		config X86_MPPARSE

arch/x86/kernel/setup.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -714,8 +714,7 @@ void __init setup_arch(char **cmdline_p)
	*/		*/
	acpi_reserve_bootmem();		acpi_reserve_bootmem();
	#endif		#endif
	#if defined(CONFIG_X86_FIND_SMP_CONFIG) && defined(CONFIG_X86_32) \|\| \		#ifdef CONFIG_X86_FIND_SMP_CONFIG
	defined(CONFIG_X86_MPPARSE) && defined(CONFIG_X86_64)
	/*		/*
	* Find and reserve possible boot-time SMP configuration:		* Find and reserve possible boot-time SMP configuration:
	*/		*/