[Xen-changelog] [linux-2.6.18-xen] Fix x86 SMP non-ACPI build.

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1203355012 0
# Node ID 9dea529497fe546d25b5dc965d8161494c27d127
# Parent  9b1b77e0eb2efc1027994ddde181c8866dc81f00
Fix x86 SMP non-ACPI build.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 drivers/xen/core/smpboot.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff -r 9b1b77e0eb2e -r 9dea529497fe drivers/xen/core/smpboot.c
--- a/drivers/xen/core/smpboot.c        Mon Feb 18 10:43:25 2008 +0000
+++ b/drivers/xen/core/smpboot.c        Mon Feb 18 17:16:52 2008 +0000
@@ -70,6 +70,13 @@ unsigned int maxcpus = NR_CPUS;
 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;
@@ -269,7 +276,7 @@ void __init smp_prepare_cpus(unsigned in
 
        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;
 
@@ -318,7 +325,7 @@ void __init smp_prepare_cpus(unsigned in
 
                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))

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog