From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 11 Feb 2009 09:49:40 +0000 (+0100)
Subject: Merge branch 'x86/apic' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen... 
X-Git-Tag: v2.6.30-rc1~211^2~26^2~2^2~10
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=d5b5a232b2f2b6e64762308e90d47248dddfd72f;hp=bf56957d176c279175464f385f3eb03d65819328;p=linux-2.6-block.git

Merge branch 'x86/apic' of git://git./linux/kernel/git/jeremy/xen into x86/apic
---

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 8d8fa992c9a0..150e6d0a3b47 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -936,7 +936,7 @@ void __init setup_arch(char **cmdline_p)
 	map_vsyscall();
 #endif
 
-#if defined(CONFIG_X86_32_NON_STANDARD) || defined(CONFIG_X86_BIGSMP)
+#ifdef CONFIG_X86_32
 	generic_apic_probe();
 #endif