瀏覽代碼

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>
Yinghai Lu 17 年之前
父節點
當前提交
d1b20afec3
共有 2 個文件被更改,包括 1 次插入3 次删除
  1. 0 1
      arch/x86/Kconfig
  2. 1 2
      arch/x86/kernel/setup.c

+ 0 - 1
arch/x86/Kconfig

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

+ 1 - 2
arch/x86/kernel/setup.c

@@ -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) || \
-    defined(CONFIG_X86_MPPARSE) && defined(CONFIG_X86_64)
+#ifdef CONFIG_X86_FIND_SMP_CONFIG
 	/*
 	/*
 	 * Find and reserve possible boot-time SMP configuration:
 	 * Find and reserve possible boot-time SMP configuration:
 	 */
 	 */