From 91727a444c492df225c8568ae9fba0866ba7ed8c Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Wed, 25 Jun 2008 17:59:41 -0700 Subject: [PATCH] --- yaml --- r: 99938 b: refs/heads/master c: d1b20afec356085a202d7832d47bfb89303ea901 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/Kconfig | 1 - trunk/arch/x86/kernel/setup.c | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2a173dc4032d..99ceed4282f0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0196bcbb150786d54a50e3074013020570a59d31 +refs/heads/master: d1b20afec356085a202d7832d47bfb89303ea901 diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig index 25ff7548d3da..9441e46cb49b 100644 --- a/trunk/arch/x86/Kconfig +++ b/trunk/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/trunk/arch/x86/kernel/setup.c b/trunk/arch/x86/kernel/setup.c index 08efab538a24..7690547ac285 100644 --- a/trunk/arch/x86/kernel/setup.c +++ b/trunk/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: */