From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 28 Mar 2008 11:33:52 +0000 (+0100)
Subject: x86: mpparse: 64-bit fix
X-Git-Tag: v2.6.26-rc1~1154^2~66
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e937fcf2fa0c1d21f9c0008ab600d46c240a984c;p=linux-2.6-omap-h63xx.git

x86: mpparse: 64-bit fix

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

diff --git a/arch/x86/kernel/mpparse_64.c b/arch/x86/kernel/mpparse_64.c
index d6229400303..5e789bdb34f 100644
--- a/arch/x86/kernel/mpparse_64.c
+++ b/arch/x86/kernel/mpparse_64.c
@@ -63,6 +63,20 @@ void *x86_bios_cpu_apicid_early_ptr;
 DEFINE_PER_CPU(u16, x86_bios_cpu_apicid) = BAD_APICID;
 EXPORT_PER_CPU_SYMBOL(x86_bios_cpu_apicid);
 
+/* Make it easy to share the UP and SMP code: */
+#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
+physid_mask_t phys_cpu_present_map;
+#endif
+
 /*
  * Intel MP BIOS table parsing routines:
  */