From a2c8357b1a2d5bd09ef1c870607170d9567d1cfd Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 27 Jan 2009 17:28:08 +0100
Subject: [PATCH] --- yaml --- r: 136640 b: refs/heads/master c:
 550fe4f198558c147c6b8273a709568222a1668a h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/arch/x86/Kconfig              | 4 ----
 trunk/arch/x86/include/asm/mpspec.h | 4 +++-
 trunk/arch/x86/kernel/setup.c       | 3 +--
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index b185baadd467..1b75fd6376c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f095df0a0cb35a52605541f619d038339b90d7cc
+refs/heads/master: 550fe4f198558c147c6b8273a709568222a1668a
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index c0d79ab366de..df7cb8d68e2f 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/arch/x86/Kconfig
@@ -254,10 +254,6 @@ config NUMA_MIGRATE_IRQ_DESC
 
 	  If you don't know what to do here, say N.
 
-config X86_FIND_SMP_CONFIG
-	def_bool y
-	depends on X86_MPPARSE || X86_VOYAGER
-
 config X86_MPPARSE
 	bool "Enable MPS table" if ACPI
 	default y
diff --git a/trunk/arch/x86/include/asm/mpspec.h b/trunk/arch/x86/include/asm/mpspec.h
index 03fb0d396543..d22f732eab8f 100644
--- a/trunk/arch/x86/include/asm/mpspec.h
+++ b/trunk/arch/x86/include/asm/mpspec.h
@@ -56,11 +56,13 @@ extern int smp_found_config;
 extern int mpc_default_type;
 extern unsigned long mp_lapic_addr;
 
-extern void find_smp_config(void);
 extern void get_smp_config(void);
+
 #ifdef CONFIG_X86_MPPARSE
+extern void find_smp_config(void);
 extern void early_reserve_e820_mpc_new(void);
 #else
+static inline void find_smp_config(void) { }
 static inline void early_reserve_e820_mpc_new(void) { }
 #endif
 
diff --git a/trunk/arch/x86/kernel/setup.c b/trunk/arch/x86/kernel/setup.c
index 609e5af60282..6abce6703c53 100644
--- a/trunk/arch/x86/kernel/setup.c
+++ b/trunk/arch/x86/kernel/setup.c
@@ -905,12 +905,11 @@ void __init setup_arch(char **cmdline_p)
 	 */
 	acpi_reserve_bootmem();
 #endif
-#ifdef CONFIG_X86_FIND_SMP_CONFIG
 	/*
 	 * Find and reserve possible boot-time SMP configuration:
 	 */
 	find_smp_config();
-#endif
+
 	reserve_crashkernel();
 
 #ifdef CONFIG_X86_64