[Xen-changelog] [linux-2.6.18-xen] Fix the x86/64 build.

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

# HG changeset patch
# User Keir Fraser <keir@xxxxxxxxxxxxx>
# Date 1181668854 -3600
# Node ID a44649e59d1fd42ac14cf3114336ba8d47e47296
# Parent  33c3009e73ec91c091b93aebc2a2b0052a3da830
Fix the x86/64 build.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
 arch/x86_64/kernel/head-xen.S |    1 +
 drivers/xen/core/smpboot.c    |    2 ++
 2 files changed, 3 insertions(+)

diff -r 33c3009e73ec -r a44649e59d1f arch/x86_64/kernel/head-xen.S
--- a/arch/x86_64/kernel/head-xen.S     Tue Jun 12 11:42:09 2007 +0100
+++ b/arch/x86_64/kernel/head-xen.S     Tue Jun 12 18:20:54 2007 +0100
@@ -50,6 +50,7 @@ NEXT_PAGE(init_level4_pgt)
 NEXT_PAGE(init_level4_pgt)
        /* This gets initialized in x86_64_start_kernel */
        .fill   512,8,0
+NEXT_PAGE(init_level4_user_pgt)
         /*
          * We update two pgd entries to make kernel and user pgd consistent
          * at pgd_populate(). It can be used for kernel modules. So we place 
diff -r 33c3009e73ec -r a44649e59d1f drivers/xen/core/smpboot.c
--- a/drivers/xen/core/smpboot.c        Tue Jun 12 11:42:09 2007 +0100
+++ b/drivers/xen/core/smpboot.c        Tue Jun 12 18:20:54 2007 +0100
@@ -72,6 +72,8 @@ EXPORT_SYMBOL(cpu_core_map);
 #if defined(__i386__)
 u8 x86_cpu_to_apicid[NR_CPUS] = { [0 ... NR_CPUS-1] = 0xff };
 EXPORT_SYMBOL(x86_cpu_to_apicid);
+#elif !defined(CONFIG_X86_IO_APIC)
+unsigned int maxcpus = NR_CPUS;
 #endif
 
 void __init prefill_possible_map(void)

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