From: Yinghai Lu <yhlu.kernel@gmail.com>
Date: Thu, 26 Jun 2008 00:59:41 +0000 (-0700)
Subject: x86: make x86_find_smp_config depends on 64 bit too
X-Git-Tag: v2.6.27-rc1~1106^2~148
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d1b20afec356085a202d7832d47bfb89303ea901;p=linux-2.6-omap-h63xx.git

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

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 25ff7548d3d..9441e46cb49 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -233,7 +233,6 @@ config SMP
 config X86_FIND_SMP_CONFIG
 	def_bool y
 	depends on X86_MPPARSE || X86_VOYAGER || X86_VISWS
-	depends on X86_32
 
 if ACPI
 config X86_MPPARSE
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 08efab538a2..7690547ac28 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -714,8 +714,7 @@ void __init setup_arch(char **cmdline_p)
 	 */
 	acpi_reserve_bootmem();
 #endif
-#if defined(CONFIG_X86_FIND_SMP_CONFIG) && defined(CONFIG_X86_32) || \
-    defined(CONFIG_X86_MPPARSE) && defined(CONFIG_X86_64)
+#ifdef CONFIG_X86_FIND_SMP_CONFIG
 	/*
 	 * Find and reserve possible boot-time SMP configuration:
 	 */