From 7b07a8d440b20ce21a608292b3abaa212f7f007a Mon Sep 17 00:00:00 2001
From: Alexey Starikovskiy <astarikovskiy@suse.de>
Date: Tue, 20 May 2008 00:29:59 +0400
Subject: [PATCH] --- yaml --- r: 99711 b: refs/heads/master c:
 136ef671df04dc157afa0d4b96c7bd23ba072c9c h: refs/heads/master i:   99709:
 112843349fbac740721a92e31dfe06e4fc964d25   99707:
 e8fde9a5f01cae7057b06f1659d7c69c6e62a965   99703:
 3b1ddfcdc938c52bc8810090e3d7a10a4e86dbed   99695:
 2b7f8d5dadef3054aa82bf1cfa35ee232fc2b9c8   99679:
 d38995fc6fec70709919e427402fbff94b5e6cc0   99647:
 6924be019949b434ae9c44c89172558eb5952924   99583:
 1dde88279ddcb6aa6e66d3a88415a35a05938c81 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86/Kconfig.debug     | 2 +-
 trunk/arch/x86/kernel/setup_32.c | 2 +-
 trunk/arch/x86/kernel/setup_64.c | 4 ++++
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 62238b31f97a..33bdafc5b66e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8732fc4b237fca3bd3cb0ec87ca8fb90271b0baf
+refs/heads/master: 136ef671df04dc157afa0d4b96c7bd23ba072c9c
diff --git a/trunk/arch/x86/Kconfig.debug b/trunk/arch/x86/Kconfig.debug
index ac1e31ba4795..d5b364b43a02 100644
--- a/trunk/arch/x86/Kconfig.debug
+++ b/trunk/arch/x86/Kconfig.debug
@@ -127,7 +127,7 @@ config 4KSTACKS
 
 config X86_FIND_SMP_CONFIG
 	def_bool y
-	depends on X86_LOCAL_APIC || X86_VOYAGER
+	depends on X86_MPPARSE || X86_VOYAGER || X86_VISWS
 	depends on X86_32
 
 config X86_MPPARSE
diff --git a/trunk/arch/x86/kernel/setup_32.c b/trunk/arch/x86/kernel/setup_32.c
index e1173aecf69a..c04e8c91daf7 100644
--- a/trunk/arch/x86/kernel/setup_32.c
+++ b/trunk/arch/x86/kernel/setup_32.c
@@ -814,7 +814,7 @@ void __init setup_arch(char **cmdline_p)
 			"CONFIG_X86_GENERICARCH or CONFIG_X86_BIGSMP.\n");
 #endif
 #endif
-#ifdef CONFIG_X86_LOCAL_APIC
+#if defined(CONFIG_X86_MPPARSE) || defined(CONFIG_X86_VISWS)
 	if (smp_found_config)
 		get_smp_config();
 #endif
diff --git a/trunk/arch/x86/kernel/setup_64.c b/trunk/arch/x86/kernel/setup_64.c
index 975a5da46e49..89e6cca5d693 100644
--- a/trunk/arch/x86/kernel/setup_64.c
+++ b/trunk/arch/x86/kernel/setup_64.c
@@ -456,10 +456,12 @@ void __init setup_arch(char **cmdline_p)
 	if (efi_enabled)
 		efi_reserve_bootmem();
 
+#ifdef CONFIG_X86_MPPARSE
        /*
 	* Find and reserve possible boot-time SMP configuration:
 	*/
 	find_smp_config();
+#endif
 #ifdef CONFIG_BLK_DEV_INITRD
 	if (boot_params.hdr.type_of_loader && boot_params.hdr.ramdisk_image) {
 		unsigned long ramdisk_image = boot_params.hdr.ramdisk_image;
@@ -502,11 +504,13 @@ void __init setup_arch(char **cmdline_p)
 
 	init_cpu_to_node();
 
+#ifdef CONFIG_X86_MPPARSE
 	/*
 	 * get boot-time SMP configuration:
 	 */
 	if (smp_found_config)
 		get_smp_config();
+#endif
 	init_apic_mappings();
 	ioapic_init_mappings();