aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/Kconfig1
-rw-r--r--arch/x86/kernel/setup.c3
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 25ff7548d3da..9441e46cb49b 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -233,7 +233,6 @@ config SMP
233config X86_FIND_SMP_CONFIG 233config X86_FIND_SMP_CONFIG
234 def_bool y 234 def_bool y
235 depends on X86_MPPARSE || X86_VOYAGER || X86_VISWS 235 depends on X86_MPPARSE || X86_VOYAGER || X86_VISWS
236 depends on X86_32
237 236
238if ACPI 237if ACPI
239config X86_MPPARSE 238config X86_MPPARSE
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 08efab538a24..7690547ac285 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -714,8 +714,7 @@ void __init setup_arch(char **cmdline_p)
714 */ 714 */
715 acpi_reserve_bootmem(); 715 acpi_reserve_bootmem();
716#endif 716#endif
717#if defined(CONFIG_X86_FIND_SMP_CONFIG) && defined(CONFIG_X86_32) || \ 717#ifdef CONFIG_X86_FIND_SMP_CONFIG
718 defined(CONFIG_X86_MPPARSE) && defined(CONFIG_X86_64)
719 /* 718 /*
720 * Find and reserve possible boot-time SMP configuration: 719 * Find and reserve possible boot-time SMP configuration:
721 */ 720 */