[Xen-changelog] Fix -xen builds.

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID aabc33c3c0ac7be9507e4b846b89264d1bd110c0
# Parent  3233e3921fddd48b1cf60187d89fffa890affbce
Fix -xen builds.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>

diff -r 3233e3921fdd -r aabc33c3c0ac 
linux-2.6-xen-sparse/arch/xen/kernel/smpboot.c
--- a/linux-2.6-xen-sparse/arch/xen/kernel/smpboot.c    Tue Oct 18 18:07:03 2005
+++ b/linux-2.6-xen-sparse/arch/xen/kernel/smpboot.c    Tue Oct 18 18:28:16 2005
@@ -74,10 +74,10 @@
 cpumask_t cpu_core_map[NR_CPUS] __cacheline_aligned;
 EXPORT_SYMBOL(cpu_core_map);
 
-#ifdef __i386__
+#if defined(__i386__)
 u8 x86_cpu_to_apicid[NR_CPUS] = { [0 ... NR_CPUS-1] = 0xff };
 EXPORT_SYMBOL(x86_cpu_to_apicid);
-#else
+#elif !defined(CONFIG_X86_IO_APIC)
 unsigned int maxcpus = NR_CPUS;
 #endif
 
diff -r 3233e3921fdd -r aabc33c3c0ac 
linux-2.6-xen-sparse/include/asm-xen/asm-i386/smp.h
--- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/smp.h       Tue Oct 18 
18:07:03 2005
+++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/smp.h       Tue Oct 18 
18:28:16 2005
@@ -54,6 +54,7 @@
 #define __smp_processor_id() (current_thread_info()->cpu)
 
 extern cpumask_t cpu_possible_map;
+#define cpu_callin_map cpu_possible_map
 
 /* We don't mark CPUs online until __cpu_up(), so we need another measure */
 static inline int num_booting_cpus(void)

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