[Xen-changelog] [xen-3.1-testing] Fix x86 SMP non-ACPI build.

["Xen patchbot-3.1-testing" <patchbot-3.1-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1203355148 0
# Node ID 4fb1c626023ea35e83da0e74786516d8a9b2894d
# Parent  b5ffb95759361a567522e5ea1a60569ca7046512
Fix x86 SMP non-ACPI build.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
linux-2.6.18-xen changeset:   425:9dea529497fe546d25b5dc965d8161494c27d127
linux-2.6.18-xen date:        Mon Feb 18 17:16:52 2008 +0000
---
 linux-2.6-xen-sparse/drivers/xen/core/smpboot.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff -r b5ffb9575936 -r 4fb1c626023e 
linux-2.6-xen-sparse/drivers/xen/core/smpboot.c
--- a/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c   Mon Feb 18 14:33:57 
2008 +0000
+++ b/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c   Mon Feb 18 17:19:08 
2008 +0000
@@ -72,6 +72,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;
@@ -270,7 +277,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;
 
@@ -319,7 +326,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