[Xen-changelog] Update ia64 sparse tree to Linux 2.6.16-rc4.

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

# HG changeset patch
# User cl349@xxxxxxxxxxxxxxxxxxxx
# Node ID 8005fbd31d8b96d7dc38576fd9c518cf73706208
# Parent  1c7145a5bb434413204a3ce4114de7f58fbb9029
Update ia64 sparse tree to Linux 2.6.16-rc4.

Signed-off-by: Alex Williamson <alex.williamson@xxxxxx>

diff -r 1c7145a5bb43 -r 8005fbd31d8b 
linux-2.6-xen-sparse/arch/ia64/kernel/entry.S
--- a/linux-2.6-xen-sparse/arch/ia64/kernel/entry.S     Tue Feb 21 11:19:13 2006
+++ b/linux-2.6-xen-sparse/arch/ia64/kernel/entry.S     Tue Feb 21 16:25:56 2006
@@ -569,7 +569,9 @@
 .mem.offset 0,0; st8.spill [r2]=r8             // store return value in slot 
for r8
 .mem.offset 8,0; st8.spill [r3]=r10            // clear error indication in 
slot for r10
        br.call.sptk.many rp=syscall_trace_leave // give parent a chance to 
catch return value
-.ret3: br.cond.sptk .work_pending_syscall_end
+.ret3:
+(pUStk)        cmp.eq.unc p6,p0=r0,r0                  // p6 <- pUStk
+       br.cond.sptk .work_pending_syscall_end
 
 strace_error:
        ld8 r3=[r2]                             // load pt_regs.r8
diff -r 1c7145a5bb43 -r 8005fbd31d8b 
linux-2.6-xen-sparse/arch/ia64/kernel/setup.c
--- a/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c     Tue Feb 21 11:19:13 2006
+++ b/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c     Tue Feb 21 16:25:56 2006
@@ -434,6 +434,7 @@
        if (early_console_setup(*cmdline_p) == 0)
                mark_bsp_online();
 
+       parse_early_param();
 #ifdef CONFIG_ACPI
        /* Initialize the ACPI boot-time table parser */
        acpi_table_init();
@@ -692,6 +693,9 @@
 setup_per_cpu_areas (void)
 {
        /* start_kernel() requires this... */
+#ifdef CONFIG_ACPI_HOTPLUG_CPU
+       prefill_possible_map();
+#endif
 }
 
 /*

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