1.1 --- a/buildconfigs/mk.linux-2.6-xen	Tue Sep 19 11:13:10 2006 +0100
     1.2 +++ b/buildconfigs/mk.linux-2.6-xen	Tue Sep 19 14:26:22 2006 +0100
     1.3 @@ -1,5 +1,5 @@
     1.4  LINUX_SERIES = 2.6
     1.5 -LINUX_VER    = 2.6.16.13
     1.6 +LINUX_VER    = 2.6.16.29
     1.7  
     1.8  EXTRAVERSION ?= xen
     1.9  

     2.1 --- a/linux-2.6-xen-sparse/arch/i386/Kconfig	Tue Sep 19 11:13:10 2006 +0100
     2.2 +++ b/linux-2.6-xen-sparse/arch/i386/Kconfig	Tue Sep 19 14:26:22 2006 +0100
     2.3 @@ -789,6 +789,9 @@ config DOUBLEFAULT
     2.4  
     2.5  endmenu
     2.6  
     2.7 +config ARCH_ENABLE_MEMORY_HOTPLUG
     2.8 +	def_bool y
     2.9 +	depends on HIGHMEM
    2.10  
    2.11  menu "Power management options (ACPI, APM)"
    2.12  	depends on !(X86_VOYAGER || XEN_UNPRIVILEGED_GUEST)

     3.1 --- a/linux-2.6-xen-sparse/arch/ia64/Kconfig	Tue Sep 19 11:13:10 2006 +0100
     3.2 +++ b/linux-2.6-xen-sparse/arch/ia64/Kconfig	Tue Sep 19 14:26:22 2006 +0100
     3.3 @@ -276,6 +276,9 @@ config HOTPLUG_CPU
     3.4  	  can be controlled through /sys/devices/system/cpu/cpu#.
     3.5  	  Say N if you want to disable CPU hotplug.
     3.6  
     3.7 +config ARCH_ENABLE_MEMORY_HOTPLUG
     3.8 +	def_bool y
     3.9 +
    3.10  config SCHED_SMT
    3.11  	bool "SMT scheduler support"
    3.12  	depends on SMP

     4.1 --- a/linux-2.6-xen-sparse/arch/x86_64/Kconfig	Tue Sep 19 11:13:10 2006 +0100
     4.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/Kconfig	Tue Sep 19 14:26:22 2006 +0100
     4.3 @@ -368,6 +368,8 @@ config HOTPLUG_CPU
     4.4  		can be controlled through /sys/devices/system/cpu/cpu#.
     4.5  		Say N if you want to disable CPU hotplug.
     4.6  
     4.7 +config ARCH_ENABLE_MEMORY_HOTPLUG
     4.8 +	def_bool y
     4.9  
    4.10  config HPET_TIMER
    4.11  	bool

     5.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/entry-xen.S	Tue Sep 19 11:13:10 2006 +0100
     5.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/entry-xen.S	Tue Sep 19 14:26:22 2006 +0100
     5.3 @@ -316,12 +316,7 @@ tracesys:
     5.4  	ja  1f
     5.5  	movq %r10,%rcx	/* fixup for C */
     5.6  	call *sys_call_table(,%rax,8)
     5.7 -	movq %rax,RAX-ARGOFFSET(%rsp)
     5.8 -1:	SAVE_REST
     5.9 -	movq %rsp,%rdi
    5.10 -	call syscall_trace_leave
    5.11 -	RESTORE_TOP_OF_STACK %rbx
    5.12 -	RESTORE_REST
    5.13 +1:	movq %rax,RAX-ARGOFFSET(%rsp)
    5.14  	/* Use IRET because user could have changed frame */
    5.15  	jmp int_ret_from_sys_call
    5.16  	CFI_ENDPROC

     6.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/traps-xen.c	Tue Sep 19 11:13:10 2006 +0100
     6.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/traps-xen.c	Tue Sep 19 14:26:22 2006 +0100
     6.3 @@ -30,6 +30,7 @@
     6.4  #include <linux/moduleparam.h>
     6.5  #include <linux/nmi.h>
     6.6  #include <linux/kprobes.h>
     6.7 +#include <linux/kexec.h>
     6.8  
     6.9  #include <asm/system.h>
    6.10  #include <asm/uaccess.h>
    6.11 @@ -438,6 +439,8 @@ void __kprobes __die(const char * str, s
    6.12  	printk(KERN_ALERT "RIP ");
    6.13  	printk_address(regs->rip); 
    6.14  	printk(" RSP <%016lx>\n", regs->rsp); 
    6.15 +	if (kexec_should_crash(current))
    6.16 +		crash_kexec(regs);
    6.17  }
    6.18  
    6.19  void die(const char * str, struct pt_regs * regs, long err)
    6.20 @@ -461,6 +464,8 @@ void __kprobes die_nmi(char *str, struct
    6.21  	 */
    6.22  	printk(str, safe_smp_processor_id());
    6.23  	show_registers(regs);
    6.24 +	if (kexec_should_crash(current))
    6.25 +		crash_kexec(regs);
    6.26  	if (panic_on_timeout || panic_on_oops)
    6.27  		panic("nmi watchdog");
    6.28  	printk("console shuts up ...\n");

     7.1 --- a/linux-2.6-xen-sparse/drivers/char/tty_io.c	Tue Sep 19 11:13:10 2006 +0100
     7.2 +++ b/linux-2.6-xen-sparse/drivers/char/tty_io.c	Tue Sep 19 14:26:22 2006 +0100
     7.3 @@ -2761,7 +2761,7 @@ static void flush_to_ldisc(void *private
     7.4  	struct tty_struct *tty = (struct tty_struct *) private_;
     7.5  	unsigned long 	flags;
     7.6  	struct tty_ldisc *disc;
     7.7 -	struct tty_buffer *tbuf;
     7.8 +	struct tty_buffer *tbuf, *head;
     7.9  	int count;
    7.10  	char *char_buf;
    7.11  	unsigned char *flag_buf;
    7.12 @@ -2778,7 +2778,9 @@ static void flush_to_ldisc(void *private
    7.13  		goto out;
    7.14  	}
    7.15  	spin_lock_irqsave(&tty->buf.lock, flags);
    7.16 -	while((tbuf = tty->buf.head) != NULL) {
    7.17 +	head = tty->buf.head;
    7.18 +	tty->buf.head = NULL;
    7.19 +	while((tbuf = head) != NULL) {
    7.20  		while ((count = tbuf->commit - tbuf->read) != 0) {
    7.21  			char_buf = tbuf->char_buf_ptr + tbuf->read;
    7.22  			flag_buf = tbuf->flag_buf_ptr + tbuf->read;
    7.23 @@ -2787,10 +2789,12 @@ static void flush_to_ldisc(void *private
    7.24  			disc->receive_buf(tty, char_buf, flag_buf, count);
    7.25  			spin_lock_irqsave(&tty->buf.lock, flags);
    7.26  		}
    7.27 -		if (tbuf->active)
    7.28 +		if (tbuf->active) {
    7.29 +			tty->buf.head = head;
    7.30  			break;
    7.31 -		tty->buf.head = tbuf->next;
    7.32 -		if (tty->buf.head == NULL)
    7.33 +		}
    7.34 +		head = tbuf->next;
    7.35 +		if (head == NULL)
    7.36  			tty->buf.tail = NULL;
    7.37  		tty_buffer_free(tty, tbuf);
    7.38  	}

     8.1 --- a/linux-2.6-xen-sparse/drivers/serial/Kconfig	Tue Sep 19 11:13:10 2006 +0100
     8.2 +++ b/linux-2.6-xen-sparse/drivers/serial/Kconfig	Tue Sep 19 14:26:22 2006 +0100
     8.3 @@ -821,6 +821,7 @@ config SERIAL_ICOM
     8.4  	tristate "IBM Multiport Serial Adapter"
     8.5  	depends on PCI && (PPC_ISERIES || PPC_PSERIES)
     8.6  	select SERIAL_CORE
     8.7 +	select FW_LOADER
     8.8  	help
     8.9  	  This driver is for a family of multiport serial adapters
    8.10  	  including 2 port RVX, 2 port internal modem, 4 port internal

     9.1 --- a/linux-2.6-xen-sparse/mm/Kconfig	Tue Sep 19 11:13:10 2006 +0100
     9.2 +++ b/linux-2.6-xen-sparse/mm/Kconfig	Tue Sep 19 14:26:22 2006 +0100
     9.3 @@ -115,7 +115,7 @@ config SPARSEMEM_EXTREME
     9.4  # eventually, we can have this option just 'select SPARSEMEM'
     9.5  config MEMORY_HOTPLUG
     9.6  	bool "Allow for memory hot-add"
     9.7 -	depends on SPARSEMEM && HOTPLUG && !SOFTWARE_SUSPEND
     9.8 +	depends on SPARSEMEM && HOTPLUG && !SOFTWARE_SUSPEND && ARCH_ENABLE_MEMORY_HOTPLUG
     9.9  
    9.10  comment "Memory hotplug is currently incompatible with Software Suspend"
    9.11  	depends on SPARSEMEM && HOTPLUG && SOFTWARE_SUSPEND

    10.1 --- a/linux-2.6-xen-sparse/mm/page_alloc.c	Tue Sep 19 11:13:10 2006 +0100
    10.2 +++ b/linux-2.6-xen-sparse/mm/page_alloc.c	Tue Sep 19 14:26:22 2006 +0100
    10.3 @@ -951,7 +951,8 @@ restart:
    10.4  		alloc_flags |= ALLOC_HARDER;
    10.5  	if (gfp_mask & __GFP_HIGH)
    10.6  		alloc_flags |= ALLOC_HIGH;
    10.7 -	alloc_flags |= ALLOC_CPUSET;
    10.8 +	if (wait)
    10.9 +		alloc_flags |= ALLOC_CPUSET;
   10.10  
   10.11  	/*
   10.12  	 * Go through the zonelist again. Let __GFP_HIGH and allocations