]> err.no Git - linux-2.6/commitdiff
x86: mpparse, move boot cpu physical apicid to apic_32.c, fix
authorIngo Molnar <mingo@elte.hu>
Fri, 28 Mar 2008 11:22:10 +0000 (12:22 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 17 Apr 2008 15:41:31 +0000 (17:41 +0200)
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/mpparse_32.c

index 9143810bb63711ec149e96f0fc1a55c36d521cd5..9b61b50a96c90f69bbac35a0e7dbd999d8d8ce1b 100644 (file)
@@ -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