ia64/xen-unstable

changeset 8946:8005fbd31d8b

Update ia64 sparse tree to Linux 2.6.16-rc4.

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
author cl349@firebug.cl.cam.ac.uk
date Tue Feb 21 16:25:56 2006 +0000 (2006-02-21)
parents 1c7145a5bb43
children 2401f414d1ad
files linux-2.6-xen-sparse/arch/ia64/kernel/entry.S linux-2.6-xen-sparse/arch/ia64/kernel/setup.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/ia64/kernel/entry.S	Tue Feb 21 11:19:13 2006 +0000
     1.2 +++ b/linux-2.6-xen-sparse/arch/ia64/kernel/entry.S	Tue Feb 21 16:25:56 2006 +0000
     1.3 @@ -569,7 +569,9 @@ GLOBAL_ENTRY(__ia64_trace_syscall)
     1.4  .mem.offset 0,0; st8.spill [r2]=r8		// store return value in slot for r8
     1.5  .mem.offset 8,0; st8.spill [r3]=r10		// clear error indication in slot for r10
     1.6  	br.call.sptk.many rp=syscall_trace_leave // give parent a chance to catch return value
     1.7 -.ret3:	br.cond.sptk .work_pending_syscall_end
     1.8 +.ret3:
     1.9 +(pUStk)	cmp.eq.unc p6,p0=r0,r0			// p6 <- pUStk
    1.10 +	br.cond.sptk .work_pending_syscall_end
    1.11  
    1.12  strace_error:
    1.13  	ld8 r3=[r2]				// load pt_regs.r8
     2.1 --- a/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c	Tue Feb 21 11:19:13 2006 +0000
     2.2 +++ b/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c	Tue Feb 21 16:25:56 2006 +0000
     2.3 @@ -434,6 +434,7 @@ setup_arch (char **cmdline_p)
     2.4  	if (early_console_setup(*cmdline_p) == 0)
     2.5  		mark_bsp_online();
     2.6  
     2.7 +	parse_early_param();
     2.8  #ifdef CONFIG_ACPI
     2.9  	/* Initialize the ACPI boot-time table parser */
    2.10  	acpi_table_init();
    2.11 @@ -692,6 +693,9 @@ void
    2.12  setup_per_cpu_areas (void)
    2.13  {
    2.14  	/* start_kernel() requires this... */
    2.15 +#ifdef CONFIG_ACPI_HOTPLUG_CPU
    2.16 +	prefill_possible_map();
    2.17 +#endif
    2.18  }
    2.19  
    2.20  /*