Fix x86 SMP non-ACPI build.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
linux-2.6.18-xen changeset:   425:9dea529497fe546d25b5dc965d8161494c27d127
linux-2.6.18-xen date:        Mon Feb 18 17:16:52 2008 +0000

diff --git a/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c b/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c
index 320af8911fedf034395cae5f609547f34aa62ede..304b960cbfdf1ebcc5e4490cb29033231b331e1b 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c
+++ b/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c
@@ -72,6 +72,13 @@ EXPORT_SYMBOL(x86_cpu_to_apicid);
 unsigned int maxcpus = NR_CPUS;
 #endif
 
+#ifdef CONFIG_ACPI
+#define set_x86_acpiid_to_apicid(acpiid, apicid) \
+       (x86_acpiid_to_apicid[acpiid] = apicid)
+#else
+#define set_x86_acpiid_to_apicid(acpiid, apicid) ((void)0)
+#endif
+
 void __init prefill_possible_map(void)
 {
        int i, rc;
@@ -270,7 +277,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
 
        cpu_2_logical_apicid[0] = 0;
        x86_cpu_to_apicid[0] = 0;
-       x86_acpiid_to_apicid[0] = 0;
+       set_x86_acpiid_to_apicid(0, 0);
 
        current_thread_info()->cpu = 0;
 
@@ -319,7 +326,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
 
                cpu_2_logical_apicid[cpu] = cpu;
                x86_cpu_to_apicid[cpu] = cpu;
-               x86_acpiid_to_apicid[cpu] = cpu;
+               set_x86_acpiid_to_apicid(cpu, cpu);
 
                idle = fork_idle(cpu);
                if (IS_ERR(idle))