From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 28 Mar 2008 11:22:10 +0000 (+0100)
Subject: x86: mpparse, move boot cpu physical apicid to apic_32.c, fix
X-Git-Tag: v2.6.26-rc1~1154^2~90
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=fae9811b775655a02dcb51fa0b6423b546468bd1;p=linux-2.6-omap-h63xx.git

x86: mpparse, move boot cpu physical apicid to apic_32.c, fix

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/kernel/mpparse_32.c b/arch/x86/kernel/mpparse_32.c
index 9143810bb63..9b61b50a96c 100644
--- a/arch/x86/kernel/mpparse_32.c
+++ b/arch/x86/kernel/mpparse_32.c
@@ -65,8 +65,10 @@ int pic_mode;
 #ifndef CONFIG_X86_SMP
 unsigned int num_processors;
 unsigned disabled_cpus __cpuinitdata;
+#ifndef CONFIG_X86_LOCAL_APIC
 unsigned int boot_cpu_physical_apicid = -1U;
 #endif
+#endif
 
 /* Make it easy to share the UP and SMP code: */
 #ifndef CONFIG_X86_SMP