/[pkg-src]/trunk/kernel26-xen/patches-2.6.25-r1/1020-2.6.25-xen-patch-2.6.19.patch

Diff of /trunk/kernel26-xen/patches-2.6.25-r1/1020-2.6.25-xen-patch-2.6.19.patch

Parent Directory | Revision Log | View Patch Patch

-revision 611 by niro,
Fri May 23 18:49:01 2008 UTC
+revision 612 by niro,
Sat May 24 01:03:50 2008 UTC
 Line 1
- diff -Naur linux-2.6.25/arch/x86/ia32/ia32entry-xen.S linux-2.6.25-xen/arch/x86/ia32/ia32entry-xen.S
+ From: www.kernel.org
- --- linux-2.6.25/arch/x86/ia32/ia32entry-xen.S	2008-05-23 20:51:11.000000000 +0200
+ Subject: Linux 2.6.19
- +++ linux-2.6.25-xen/arch/x86/ia32/ia32entry-xen.S	2008-05-23 20:39:03.000000000 +0200
+ Patch-mainline: 2.6.19
+ Automatically created from "patches.kernel.org/patch-2.6.19" by xen-port-patches.py
+ Acked-by: jbeulich@novell.com
+ ---
+  arch/x86/Kconfig                              |    1
+  arch/x86/ia32/ia32entry-xen.S                 |    9
+  arch/x86/kernel/Makefile                      |    5
+  arch/x86/kernel/apic_32-xen.c                 |    9
+  arch/x86/kernel/apic_64-xen.c                 |   20
+  arch/x86/kernel/cpu/common-xen.c              |   20
+  arch/x86/kernel/e820_64-xen.c                 |  320 +++---
+  arch/x86/kernel/early_printk-xen.c            |   20
+  arch/x86/kernel/entry_32-xen.S                |  139 +-
+  arch/x86/kernel/entry_64-xen.S                |  106 --
+  arch/x86/kernel/genapic_xen_64.c              |    9
+  arch/x86/kernel/head64-xen.c                  |   44
+  arch/x86/kernel/head_32-xen.S                 |    2
+  arch/x86/kernel/head_64-xen.S                 |    5
+  arch/x86/kernel/io_apic_32-xen.c              |  750 +++++++++------
+  arch/x86/kernel/io_apic_64-xen.c              | 1250 +++++++++++---------------
+  arch/x86/kernel/ioport_64-xen.c               |    1
+  arch/x86/kernel/irq_32-xen.c                  |   19
+  arch/x86/kernel/irq_64-xen.c                  |   35
+  arch/x86/kernel/ldt_32-xen.c                  |    2
+  arch/x86/kernel/microcode-xen.c               |   85 +
+  arch/x86/kernel/mpparse_32-xen.c              |   70 -
+  arch/x86/kernel/mpparse_64-xen.c              |  313 +-----
+  arch/x86/kernel/pci-dma_32-xen.c              |   16
+  arch/x86/kernel/pci-swiotlb_64-xen.c          |    3
+  arch/x86/kernel/process_32-xen.c              |   29
+  arch/x86/kernel/process_64-xen.c              |   90 +
+  arch/x86/kernel/setup64-xen.c                 |   41
+  arch/x86/kernel/setup_32-xen.c                |  430 +++-----
+  arch/x86/kernel/setup_64-xen.c                |  271 +----
+  arch/x86/kernel/smp_32-xen.c                  |   75 +
+  arch/x86/kernel/smp_64-xen.c                  |   35
+  arch/x86/kernel/time_32-xen.c                 |   86 -
+  arch/x86/kernel/traps_32-xen.c                |  238 +++-
+  arch/x86/kernel/traps_64-xen.c                |  220 +++-
+  arch/x86/kernel/vsyscall_64-xen.c             |  117 ++
+  arch/x86/mach-xen/setup.c                     |    6
+  arch/x86/mm/fault_32-xen.c                    |   29
+  arch/x86/mm/fault_64-xen.c                    |   34
+  arch/x86/mm/highmem_32-xen.c                  |   31
+  arch/x86/mm/hypervisor.c                      |    9
+  arch/x86/mm/init_32-xen.c                     |   89 +
+  arch/x86/mm/init_64-xen.c                     |  184 +--
+  arch/x86/mm/ioremap_32-xen.c                  |   10
+  arch/x86/mm/pageattr_64-xen.c                 |   24
+  arch/x86/mm/pgtable_32-xen.c                  |   31
+  arch/x86/pci/irq-xen.c                        |   38
+  drivers/char/tpm/tpm_xen.c                    |    5
+  drivers/pci/Kconfig                           |    2
+  drivers/xen/Kconfig                           |    3
+  drivers/xen/balloon/balloon.c                 |    2
+  drivers/xen/blkback/blkback.c                 |    2
+  drivers/xen/blkback/common.h                  |    2
+  drivers/xen/blkfront/blkfront.c               |    4
+  drivers/xen/blktap/blktap.c                   |    2
+  drivers/xen/blktap/common.h                   |    2
+  drivers/xen/console/console.c                 |   10
+  drivers/xen/console/xencons_ring.c            |    4
+  drivers/xen/core/evtchn.c                     |   50 -
+  drivers/xen/core/reboot.c                     |    3
+  drivers/xen/core/smpboot.c                    |    6
+  drivers/xen/fbfront/xenfb.c                   |    3
+  drivers/xen/fbfront/xenkbd.c                  |    2
+  drivers/xen/gntdev/gntdev.c                   |   11
+  drivers/xen/netback/accel.c                   |    2
+  drivers/xen/netback/common.h                  |    2
+  drivers/xen/netback/loopback.c                |    2
+  drivers/xen/netback/netback.c                 |    6
+  drivers/xen/netfront/netfront.c               |    8
+  drivers/xen/pciback/pciback.h                 |    2
+  drivers/xen/pciback/pciback_ops.c             |    2
+  drivers/xen/pcifront/pci_op.c                 |    8
+  drivers/xen/privcmd/compat_privcmd.c          |    1
+  drivers/xen/privcmd/privcmd.c                 |    2
+  drivers/xen/sfc_netback/accel_xenbus.c        |    6
+  drivers/xen/sfc_netfront/accel.h              |    6
+  drivers/xen/sfc_netfront/accel_msg.c          |    6
+  drivers/xen/sfc_netfront/accel_tso.c          |    2
+  drivers/xen/sfc_netfront/accel_vi.c           |    4
+  drivers/xen/tpmback/common.h                  |    2
+  drivers/xen/tpmback/tpmback.c                 |    4
+  drivers/xen/xenbus/xenbus_comms.c             |    2
+  drivers/xen/xenoprof/xenoprofile.c            |    2
+  include/asm-generic/pgtable.h                 |    2
+  include/asm-x86/mach-xen/asm/desc_32.h        |  127 +-
+  include/asm-x86/mach-xen/asm/dma-mapping_64.h |    7
+  include/asm-x86/mach-xen/asm/e820_64.h        |   15
+  include/asm-x86/mach-xen/asm/fixmap_32.h      |    5
+  include/asm-x86/mach-xen/asm/fixmap_64.h      |    2
+  include/asm-x86/mach-xen/asm/hw_irq_32.h      |    8
+  include/asm-x86/mach-xen/asm/hw_irq_64.h      |   10
+  include/asm-x86/mach-xen/asm/io_32.h          |   27
+  include/asm-x86/mach-xen/asm/io_64.h          |   27
+  include/asm-x86/mach-xen/asm/pgtable-2level.h |   12
+  include/asm-x86/mach-xen/asm/pgtable-3level.h |   14
+  include/asm-x86/mach-xen/asm/pgtable_32.h     |  143 +-
+  include/asm-x86/mach-xen/asm/pgtable_64.h     |   86 +
+  include/asm-x86/mach-xen/asm/processor_32.h   |   62 -
+  include/asm-x86/mach-xen/asm/processor_64.h   |    2
+  include/asm-x86/mach-xen/asm/segment_32.h     |   19
+  include/asm-x86/mach-xen/asm/smp_32.h         |   25
+  include/asm-x86/mach-xen/asm/smp_64.h         |   27
+  include/asm-x86/mach-xen/asm/system_32.h      |   36
+  include/asm-x86/mach-xen/asm/system_64.h      |    1
+  include/asm-x86/mach-xen/asm/tlbflush_32.h    |    2
+  include/asm-x86/mach-xen/asm/tlbflush_64.h    |    3
+  include/asm-x86/thread_info_64.h              |    4
+  include/linux/skbuff.h                        |    7
+  include/xen/evtchn.h                          |   10
+  include/xen/xencons.h                         |    2
+  mm/mprotect.c                                 |    2
+  net/core/dev.c                                |    8
+files changed, 3102 insertions(+), 3145 deletions(-)
+ --- a/arch/x86/Kconfig
+ +++ b/arch/x86/Kconfig
+ @@ -390,6 +390,7 @@
+  menuconfig PARAVIRT_GUEST
+  	bool "Paravirtualized guest support"
+ +	depends on !X86_XEN && !X86_64_XEN
+  	help
+  	  Say Y here to get to see options related to running Linux under
+  	  various hypervisors.  This option alone does not add any kernel code.
+ --- a/arch/x86/ia32/ia32entry-xen.S
+ +++ b/arch/x86/ia32/ia32entry-xen.S
  @@ -83,6 +83,7 @@
    */
   ENTRY(ia32_sysenter_target)
-Line 50 
 diff -Naur linux-2.6.25/arch/x86/ia32/ia
+Line 182 
 diff -Naur linux-2.6.25/arch/x86/ia32/ia
   	.quad compat_sys_move_pages
  +	.quad sys_getcpu
   ia32_syscall_end:
- diff -Naur linux-2.6.25/arch/x86/Kconfig linux-2.6.25-xen/arch/x86/Kconfig
+ --- a/arch/x86/kernel/Makefile
- --- linux-2.6.25/arch/x86/Kconfig	2008-05-23 20:51:22.000000000 +0200
+ +++ b/arch/x86/kernel/Makefile
- +++ linux-2.6.25-xen/arch/x86/Kconfig	2008-05-23 20:39:03.000000000 +0200
+ @@ -91,7 +91,7 @@
- @@ -390,6 +390,7 @@
+  ###
+  # 64 bit specific files
+  ifeq ($(CONFIG_X86_64),y)
+ -        obj-y				+= genapic_64.o genapic_flat_64.o
+ +        obj-$(CONFIG_X86_LOCAL_APIC)	+= genapic_64.o genapic_flat_64.o
+          obj-$(CONFIG_X86_XEN_GENAPIC)	+= genapic_64.o genapic_xen_64.o
+          obj-$(CONFIG_X86_PM_TIMER)	+= pmtimer_64.o
+          obj-$(CONFIG_AUDIT)		+= audit_64.o
+ @@ -104,5 +104,6 @@
+  	pci-dma_64-$(CONFIG_XEN)	+= pci-dma_32.o
+  endif
-  menuconfig PARAVIRT_GUEST
+ -disabled-obj-$(CONFIG_XEN) := i8253.o i8259_$(BITS).o reboot.o smpboot_$(BITS).o tsc_$(BITS).o
-  	bool "Paravirtualized guest support"
+ +disabled-obj-$(CONFIG_XEN) := early-quirks.o i8253.o i8259_$(BITS).o reboot.o \
- +	depends on !X86_XEN && !X86_64_XEN
+ +	smpboot_$(BITS).o tsc_$(BITS).o
-  	help
+  %/head_$(BITS).o %/head_$(BITS).s: $(if $(CONFIG_XEN),EXTRA_AFLAGS,dummy) :=
-  	  Say Y here to get to see options related to running Linux under
+ --- a/arch/x86/kernel/apic_32-xen.c
-  	  various hypervisors.  This option alone does not add any kernel code.
+ +++ b/arch/x86/kernel/apic_32-xen.c
- diff -Naur linux-2.6.25/arch/x86/kernel/apic_32-xen.c linux-2.6.25-xen/arch/x86/kernel/apic_32-xen.c
- --- linux-2.6.25/arch/x86/kernel/apic_32-xen.c	2008-05-23 20:51:11.000000000 +0200
- +++ linux-2.6.25-xen/arch/x86/kernel/apic_32-xen.c	2008-05-23 20:39:03.000000000 +0200
  @@ -54,7 +54,6 @@
   /*
    * Knob to control our willingness to enable the local APIC.
-Line 104 
 diff -Naur linux-2.6.25/arch/x86/kernel/
+Line 243 
 diff -Naur linux-2.6.25/arch/x86/kernel/
   #endif
   	}
   }
- diff -Naur linux-2.6.25/arch/x86/kernel/apic_64-xen.c linux-2.6.25-xen/arch/x86/kernel/apic_64-xen.c
+ --- a/arch/x86/kernel/apic_64-xen.c
- --- linux-2.6.25/arch/x86/kernel/apic_64-xen.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/arch/x86/kernel/apic_64-xen.c
- +++ linux-2.6.25-xen/arch/x86/kernel/apic_64-xen.c	2008-05-23 20:39:03.000000000 +0200
  @@ -43,7 +43,7 @@
    */
   void ack_bad_irq(unsigned int irq)
-Line 172 
 diff -Naur linux-2.6.25/arch/x86/kernel/
+Line 310 
 diff -Naur linux-2.6.25/arch/x86/kernel/
   #endif
   	return 1;
- diff -Naur linux-2.6.25/arch/x86/kernel/cpu/common-xen.c linux-2.6.25-xen/arch/x86/kernel/cpu/common-xen.c
+ --- a/arch/x86/kernel/cpu/common-xen.c
- --- linux-2.6.25/arch/x86/kernel/cpu/common-xen.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/arch/x86/kernel/cpu/common-xen.c
- +++ linux-2.6.25-xen/arch/x86/kernel/cpu/common-xen.c	2008-05-23 20:39:03.000000000 +0200
  @@ -43,7 +43,7 @@
   extern int disable_pse;
-Line 238 
 diff -Naur linux-2.6.25/arch/x86/kernel/
+Line 375 
 diff -Naur linux-2.6.25/arch/x86/kernel/
   	/* Clear all 6 debug registers: */
   	set_debugreg(0, 0);
- diff -Naur linux-2.6.25/arch/x86/kernel/e820_64-xen.c linux-2.6.25-xen/arch/x86/kernel/e820_64-xen.c
+ --- a/arch/x86/kernel/e820_64-xen.c
- --- linux-2.6.25/arch/x86/kernel/e820_64-xen.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/arch/x86/kernel/e820_64-xen.c
- +++ linux-2.6.25-xen/arch/x86/kernel/e820_64-xen.c	2008-05-23 20:39:03.000000000 +0200
  @@ -16,6 +16,7 @@
   #include <linux/string.h>
   #include <linux/kexec.h>
-Line 721 
 diff -Naur linux-2.6.25/arch/x86/kernel/
+Line 857 
 diff -Naur linux-2.6.25/arch/x86/kernel/
   }
   unsigned long pci_mem_start = 0xaeedbabe;
- diff -Naur linux-2.6.25/arch/x86/kernel/early_printk-xen.c linux-2.6.25-xen/arch/x86/kernel/early_printk-xen.c
+ --- a/arch/x86/kernel/early_printk-xen.c
- --- linux-2.6.25/arch/x86/kernel/early_printk-xen.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/arch/x86/kernel/early_printk-xen.c
- +++ linux-2.6.25-xen/arch/x86/kernel/early_printk-xen.c	2008-05-23 20:39:03.000000000 +0200
  @@ -244,20 +244,16 @@
   static int __initdata keep_early;
-Line 770 
 diff -Naur linux-2.6.25/arch/x86/kernel/
+Line 905 
 diff -Naur linux-2.6.25/arch/x86/kernel/
   }
  -__setup("earlyprintk=", setup_early_printk);
- diff -Naur linux-2.6.25/arch/x86/kernel/entry_32-xen.S linux-2.6.25-xen/arch/x86/kernel/entry_32-xen.S
+ --- a/arch/x86/kernel/entry_32-xen.S
- --- linux-2.6.25/arch/x86/kernel/entry_32-xen.S	2008-05-23 20:51:22.000000000 +0200
+ +++ b/arch/x86/kernel/entry_32-xen.S
- +++ linux-2.6.25-xen/arch/x86/kernel/entry_32-xen.S	2008-05-23 20:39:03.000000000 +0200
  @@ -80,8 +80,12 @@
   NMI_MASK	= 0x80000000
-Line 1145 
 diff -Naur linux-2.6.25/arch/x86/kernel/
+Line 1279 
 diff -Naur linux-2.6.25/arch/x86/kernel/
   .section .rodata,"a"
   #include "syscall_table.S"
- diff -Naur linux-2.6.25/arch/x86/kernel/entry_64-xen.S linux-2.6.25-xen/arch/x86/kernel/entry_64-xen.S
+ --- a/arch/x86/kernel/entry_64-xen.S
- --- linux-2.6.25/arch/x86/kernel/entry_64-xen.S	2008-05-23 20:51:11.000000000 +0200
+ +++ b/arch/x86/kernel/entry_64-xen.S
- +++ linux-2.6.25-xen/arch/x86/kernel/entry_64-xen.S	2008-05-23 20:47:55.000000000 +0200
- @@ -4,9 +4,6 @@
-   *  Copyright (C) 1991, 1992  Linus Torvalds
-   *  Copyright (C) 2000, 2001, 2002  Andi Kleen SuSE Labs
-   *  Copyright (C) 2000  Pavel Machek <pavel@suse.cz>
- - *
- - *  $Id: 1020-2.6.25-xen-patch-2.6.19.patch,v 1.2 2008-05-23 18:49:01 niro Exp $
- - *
-   *  Jun Nakajima <jun.nakajima@intel.com>
-   *  Asit Mallick <asit.k.mallick@intel.com>
-   *      Modified for Xen
  @@ -26,15 +23,25 @@
    * at the top of the kernel process stack.
    * - partial stack frame: partially saved registers upto R11.
-Line 1205 
 diff -Naur linux-2.6.25/arch/x86/kernel/
+Line 1328 
 diff -Naur linux-2.6.25/arch/x86/kernel/
   	CFI_DEF_CFA rsp,SS+8-\ref
   	/*CFI_REL_OFFSET ss,SS-\ref*/
   	CFI_REL_OFFSET rsp,RSP-\ref
- @@ -255,6 +264,8 @@
+ @@ -334,6 +343,8 @@
-  	CFI_REMEMBER_STATE
+  	LOAD_ARGS ARGOFFSET  /* reload args from stack in case ptrace changed it */
-  	jnz tracesys
+  	RESTORE_REST
   	cmpq $__NR_syscall_max,%rax
  +	movq $-ENOSYS,%rcx
  +	cmova %rcx,%rax
-  	ja badsys
+  	ja  1f
-  	movq %r10,%rcx
+  	movq %r10,%rcx	/* fixup for C */
-  	call *sys_call_table(,%rax,8)  # XXX:	 rip relative
+  	call *sys_call_table(,%rax,8)
  @@ -349,6 +360,7 @@
    */
   ENTRY(int_ret_from_sys_call)
-Line 1390 
 diff -Naur linux-2.6.25/arch/x86/kernel/
+Line 1513 
 diff -Naur linux-2.6.25/arch/x86/kernel/
   ENTRY(alignment_check)
   	errorentry do_alignment_check
- diff -Naur linux-2.6.25/arch/x86/kernel/genapic_xen_64.c linux-2.6.25-xen/arch/x86/kernel/genapic_xen_64.c
+ --- a/arch/x86/kernel/genapic_xen_64.c
- --- linux-2.6.25/arch/x86/kernel/genapic_xen_64.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/arch/x86/kernel/genapic_xen_64.c
- +++ linux-2.6.25-xen/arch/x86/kernel/genapic_xen_64.c	2008-05-23 20:39:03.000000000 +0200
  @@ -71,6 +71,13 @@
   	return cpu_online_map;
   }
-Line 1417 
 diff -Naur linux-2.6.25/arch/x86/kernel/
+Line 1539 
 diff -Naur linux-2.6.25/arch/x86/kernel/
   #ifdef CONFIG_XEN_PRIVILEGED_GUEST
   	.apic_id_registered = xen_apic_id_registered,
   #endif
- diff -Naur linux-2.6.25/arch/x86/kernel/head_32-xen.S linux-2.6.25-xen/arch/x86/kernel/head_32-xen.S
+ --- a/arch/x86/kernel/head64-xen.c
- --- linux-2.6.25/arch/x86/kernel/head_32-xen.S	2008-05-23 20:51:11.000000000 +0200
+ +++ b/arch/x86/kernel/head64-xen.c
- +++ linux-2.6.25-xen/arch/x86/kernel/head_32-xen.S	2008-05-23 20:39:03.000000000 +0200
- @@ -62,7 +62,7 @@
-  	movl %eax,%gs
-  	cld			# gcc2 wants the direction flag cleared at all times
- -	pushl %eax		# fake return address
- +	pushl $0		# fake return address for unwinder
-  	jmp start_kernel
-  #define HYPERCALL_PAGE_OFFSET 0x1000
- diff -Naur linux-2.6.25/arch/x86/kernel/head64-xen.c linux-2.6.25-xen/arch/x86/kernel/head64-xen.c
- --- linux-2.6.25/arch/x86/kernel/head64-xen.c	2008-05-23 20:51:11.000000000 +0200
- +++ linux-2.6.25-xen/arch/x86/kernel/head64-xen.c	2008-05-23 20:39:03.000000000 +0200
  @@ -54,11 +54,9 @@
   	new_data = *(int *) (x86_boot_params + NEW_CL_POINTER);
   	if (!new_data) {
-Line 1513 
 diff -Naur linux-2.6.25/arch/x86/kernel/
+Line 1622 
 diff -Naur linux-2.6.25/arch/x86/kernel/
  -	setup_boot_cpu_data();
   	start_kernel();
   }
- diff -Naur linux-2.6.25/arch/x86/kernel/head_64-xen.S linux-2.6.25-xen/arch/x86/kernel/head_64-xen.S
+ --- a/arch/x86/kernel/head_32-xen.S
- --- linux-2.6.25/arch/x86/kernel/head_64-xen.S	2008-05-23 20:51:11.000000000 +0200
+ +++ b/arch/x86/kernel/head_32-xen.S
- +++ linux-2.6.25-xen/arch/x86/kernel/head_64-xen.S	2008-05-23 20:49:19.000000000 +0200
+ @@ -62,7 +62,7 @@
- @@ -5,9 +5,6 @@
+  	movl %eax,%gs
-   *  Copyright (C) 2000 Pavel Machek <pavel@suse.cz>
+  	cld			# gcc2 wants the direction flag cleared at all times
-   *  Copyright (C) 2000 Karsten Keil <kkeil@suse.de>
-   *  Copyright (C) 2001,2002 Andi Kleen <ak@suse.de>
+ -	pushl %eax		# fake return address
- - *
+ +	pushl $0		# fake return address for unwinder
- - *  $Id: 1020-2.6.25-xen-patch-2.6.19.patch,v 1.2 2008-05-23 18:49:01 niro Exp $
+  	jmp start_kernel
- - *
-   *  Jun Nakajima <jun.nakajima@intel.com>
+  #define HYPERCALL_PAGE_OFFSET 0x1000
-   *    Modified for Xen
+ --- a/arch/x86/kernel/head_64-xen.S
-   */
+ +++ b/arch/x86/kernel/head_64-xen.S
  @@ -149,7 +146,7 @@
   	.quad	0,0			/* TSS */
   	.quad	0,0			/* LDT */
-Line 1535 
 diff -Naur linux-2.6.25/arch/x86/kernel/
+Line 1644 
 diff -Naur linux-2.6.25/arch/x86/kernel/
   gdt_end:
   	/* asm/segment.h:GDT_ENTRIES must match this */
   	/* This should be a multiple of the cache line size */
- diff -Naur linux-2.6.25/arch/x86/kernel/io_apic_32-xen.c linux-2.6.25-xen/arch/x86/kernel/io_apic_32-xen.c
+ --- a/arch/x86/kernel/io_apic_32-xen.c
- --- linux-2.6.25/arch/x86/kernel/io_apic_32-xen.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/arch/x86/kernel/io_apic_32-xen.c
- +++ linux-2.6.25-xen/arch/x86/kernel/io_apic_32-xen.c	2008-05-23 20:39:03.000000000 +0200
  @@ -31,6 +31,9 @@
   #include <linux/acpi.h>
   #include <linux/module.h>
-Line 2612 
 diff -Naur linux-2.6.25/arch/x86/kernel/
+Line 2720 
 diff -Naur linux-2.6.25/arch/x86/kernel/
  +	return 0;
  +}
  +early_param("noapic", parse_noapic);
- diff -Naur linux-2.6.25/arch/x86/kernel/io_apic_64-xen.c linux-2.6.25-xen/arch/x86/kernel/io_apic_64-xen.c
+ --- a/arch/x86/kernel/io_apic_64-xen.c
- --- linux-2.6.25/arch/x86/kernel/io_apic_64-xen.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/arch/x86/kernel/io_apic_64-xen.c
- +++ linux-2.6.25-xen/arch/x86/kernel/io_apic_64-xen.c	2008-05-23 20:39:03.000000000 +0200
  @@ -26,9 +26,12 @@
   #include <linux/delay.h>
   #include <linux/sched.h>
-Line 2742 
 diff -Naur linux-2.6.25/arch/x86/kernel/
+Line 2849 
 diff -Naur linux-2.6.25/arch/x86/kernel/
   	apic_op.value = value;
   	WARN_ON(HYPERVISOR_physdev_op(PHYSDEVOP_apic_write, &apic_op));
  +#endif
- +}
+  }
- +
+ -#define io_apic_read(a,r)    xen_io_apic_read(a,r)
+ -#define io_apic_write(a,r,v) xen_io_apic_write(a,r,v)
  +#ifndef CONFIG_XEN
  +/*
  + * Re-write a value: to be used for read-modify-write
-Line 2753 
 diff -Naur linux-2.6.25/arch/x86/kernel/
+Line 2862 
 diff -Naur linux-2.6.25/arch/x86/kernel/
  +{
  +	struct io_apic __iomem *io_apic = io_apic_base(apic);
  +	writel(value, &io_apic->data);
-  }
+ +}
  +#else
  +#define io_apic_modify io_apic_write
  +#endif
- -#define io_apic_read(a,r)    xen_io_apic_read(a,r)
+ -#define clear_IO_APIC() ((void)0)
- -#define io_apic_write(a,r,v) xen_io_apic_write(a,r,v)
  +/*
  + * Synchronize the IO-APIC and the CPU by doing
  + * a dummy read from the IO-APIC
-Line 2772 
 diff -Naur linux-2.6.25/arch/x86/kernel/
+Line 2880 
 diff -Naur linux-2.6.25/arch/x86/kernel/
  +#endif
  +}
- -#define clear_IO_APIC() ((void)0)
+ -#else
  +union entry_union {
  +	struct { u32 w1, w2; };
  +	struct IO_APIC_route_entry entry;
  +};
+ +
- -#else
  +static struct IO_APIC_route_entry ioapic_read_entry(int apic, int pin)
  +{
  +	union entry_union eu;
-Line 4306 
 diff -Naur linux-2.6.25/arch/x86/kernel/
+Line 4413 
 diff -Naur linux-2.6.25/arch/x86/kernel/
   	spin_unlock_irqrestore(&ioapic_lock, flags);
   	return 0;
- diff -Naur linux-2.6.25/arch/x86/kernel/ioport_64-xen.c linux-2.6.25-xen/arch/x86/kernel/ioport_64-xen.c
+ --- a/arch/x86/kernel/ioport_64-xen.c
- --- linux-2.6.25/arch/x86/kernel/ioport_64-xen.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/arch/x86/kernel/ioport_64-xen.c
- +++ linux-2.6.25-xen/arch/x86/kernel/ioport_64-xen.c	2008-05-23 20:39:03.000000000 +0200
  @@ -58,6 +58,7 @@
   		memset(bitmap, 0xff, IO_BITMAP_BYTES);
-Line 4317 
 diff -Naur linux-2.6.25/arch/x86/kernel/
+Line 4423 
 diff -Naur linux-2.6.25/arch/x86/kernel/
   		set_xen_guest_handle(set_iobitmap.bitmap, (char *)bitmap);
   		set_iobitmap.nr_ports = IO_BITMAP_BITS;
- diff -Naur linux-2.6.25/arch/x86/kernel/irq_32-xen.c linux-2.6.25-xen/arch/x86/kernel/irq_32-xen.c
+ --- a/arch/x86/kernel/irq_32-xen.c
- --- linux-2.6.25/arch/x86/kernel/irq_32-xen.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/arch/x86/kernel/irq_32-xen.c
- +++ linux-2.6.25-xen/arch/x86/kernel/irq_32-xen.c	2008-05-23 20:39:03.000000000 +0200
  @@ -53,8 +53,10 @@
    */
   fastcall unsigned int do_IRQ(struct pt_regs *regs)
-Line 4376 
 diff -Naur linux-2.6.25/arch/x86/kernel/
+Line 4481 
 diff -Naur linux-2.6.25/arch/x86/kernel/
   		seq_printf(p, "  %s", action->name);
   		for (action=action->next; action; action = action->next)
- diff -Naur linux-2.6.25/arch/x86/kernel/irq_64-xen.c linux-2.6.25-xen/arch/x86/kernel/irq_64-xen.c
+ --- a/arch/x86/kernel/irq_64-xen.c
- --- linux-2.6.25/arch/x86/kernel/irq_64-xen.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/arch/x86/kernel/irq_64-xen.c
- +++ linux-2.6.25-xen/arch/x86/kernel/irq_64-xen.c	2008-05-23 20:39:03.000000000 +0200
  @@ -20,11 +20,6 @@
   #include <asm/idle.h>
-Line 4458 
 diff -Naur linux-2.6.25/arch/x86/kernel/
+Line 4562 
 diff -Naur linux-2.6.25/arch/x86/kernel/
  +        printk("unexpected IRQ trap at irq %02x\n", irq);
   }
   #endif
- diff -Naur linux-2.6.25/arch/x86/kernel/ldt_32-xen.c linux-2.6.25-xen/arch/x86/kernel/ldt_32-xen.c
+ --- a/arch/x86/kernel/ldt_32-xen.c
- --- linux-2.6.25/arch/x86/kernel/ldt_32-xen.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/arch/x86/kernel/ldt_32-xen.c
- +++ linux-2.6.25-xen/arch/x86/kernel/ldt_32-xen.c	2008-05-23 20:39:03.000000000 +0200
  @@ -1,5 +1,5 @@
   /*
  - * linux/kernel/ldt.c
-Line 4468 
 diff -Naur linux-2.6.25/arch/x86/kernel/
+Line 4571 
 diff -Naur linux-2.6.25/arch/x86/kernel/
    *
    * Copyright (C) 1992 Krishna Balasubramanian and Linus Torvalds
    * Copyright (C) 1999 Ingo Molnar <mingo@redhat.com>
- diff -Naur linux-2.6.25/arch/x86/kernel/Makefile linux-2.6.25-xen/arch/x86/kernel/Makefile
+ --- a/arch/x86/kernel/microcode-xen.c
- --- linux-2.6.25/arch/x86/kernel/Makefile	2008-05-23 20:51:22.000000000 +0200
+ +++ b/arch/x86/kernel/microcode-xen.c
- +++ linux-2.6.25-xen/arch/x86/kernel/Makefile	2008-05-23 20:39:03.000000000 +0200
- @@ -91,7 +91,7 @@
-  ###
-  # 64 bit specific files
-  ifeq ($(CONFIG_X86_64),y)
- -        obj-y				+= genapic_64.o genapic_flat_64.o
- +        obj-$(CONFIG_X86_LOCAL_APIC)	+= genapic_64.o genapic_flat_64.o
-          obj-$(CONFIG_X86_XEN_GENAPIC)	+= genapic_64.o genapic_xen_64.o
-          obj-$(CONFIG_X86_PM_TIMER)	+= pmtimer_64.o
-          obj-$(CONFIG_AUDIT)		+= audit_64.o
- @@ -104,5 +104,6 @@
-  	pci-dma_64-$(CONFIG_XEN)	+= pci-dma_32.o
-  endif
- -disabled-obj-$(CONFIG_XEN) := i8253.o i8259_$(BITS).o reboot.o smpboot_$(BITS).o tsc_$(BITS).o
- +disabled-obj-$(CONFIG_XEN) := early-quirks.o i8253.o i8259_$(BITS).o reboot.o \
- +	smpboot_$(BITS).o tsc_$(BITS).o
-  %/head_$(BITS).o %/head_$(BITS).s: $(if $(CONFIG_XEN),EXTRA_AFLAGS,dummy) :=
- diff -Naur linux-2.6.25/arch/x86/kernel/microcode-xen.c linux-2.6.25-xen/arch/x86/kernel/microcode-xen.c
- --- linux-2.6.25/arch/x86/kernel/microcode-xen.c	2008-05-23 20:51:11.000000000 +0200
- +++ linux-2.6.25-xen/arch/x86/kernel/microcode-xen.c	2008-05-23 20:39:03.000000000 +0200
  @@ -2,6 +2,7 @@
    *	Intel CPU Microcode Update Driver for Linux
    *
-Line 4626 
 diff -Naur linux-2.6.25/arch/x86/kernel/
+Line 4708 
 diff -Naur linux-2.6.25/arch/x86/kernel/
   module_init(microcode_init)
   module_exit(microcode_exit)
  -MODULE_ALIAS_MISCDEV(MICROCODE_MINOR);
- diff -Naur linux-2.6.25/arch/x86/kernel/mpparse_32-xen.c linux-2.6.25-xen/arch/x86/kernel/mpparse_32-xen.c
+ --- a/arch/x86/kernel/mpparse_32-xen.c
- --- linux-2.6.25/arch/x86/kernel/mpparse_32-xen.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/arch/x86/kernel/mpparse_32-xen.c
- +++ linux-2.6.25-xen/arch/x86/kernel/mpparse_32-xen.c	2008-05-23 20:39:03.000000000 +0200
  @@ -30,6 +30,7 @@
   #include <asm/io_apic.h>
-Line 4795 
 diff -Naur linux-2.6.25/arch/x86/kernel/
+Line 4876 
 diff -Naur linux-2.6.25/arch/x86/kernel/
   	/*
   	 * Mapping between Global System Interrups, which
   	 * represent all possible interrupts, and IRQs
- diff -Naur linux-2.6.25/arch/x86/kernel/mpparse_64-xen.c linux-2.6.25-xen/arch/x86/kernel/mpparse_64-xen.c
+ --- a/arch/x86/kernel/mpparse_64-xen.c
- --- linux-2.6.25/arch/x86/kernel/mpparse_64-xen.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/arch/x86/kernel/mpparse_64-xen.c
- +++ linux-2.6.25-xen/arch/x86/kernel/mpparse_64-xen.c	2008-05-23 20:39:03.000000000 +0200
  @@ -41,8 +41,7 @@
    * Various Linux-internal data structures created from the
    * MP-table.
-Line 5411 
 diff -Naur linux-2.6.25/arch/x86/kernel/
+Line 5491 
 diff -Naur linux-2.6.25/arch/x86/kernel/
  -
  -#endif /*CONFIG_X86_IO_APIC*/
   #endif /*CONFIG_ACPI*/
- diff -Naur linux-2.6.25/arch/x86/kernel/pci-dma_32-xen.c linux-2.6.25-xen/arch/x86/kernel/pci-dma_32-xen.c
+ --- a/arch/x86/kernel/pci-dma_32-xen.c
- --- linux-2.6.25/arch/x86/kernel/pci-dma_32-xen.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/arch/x86/kernel/pci-dma_32-xen.c
- +++ linux-2.6.25-xen/arch/x86/kernel/pci-dma_32-xen.c	2008-05-23 20:39:03.000000000 +0200
  @@ -116,8 +116,7 @@
   {
   	int i, rc;
-Line 5472 
 diff -Naur linux-2.6.25/arch/x86/kernel/
+Line 5551 
 diff -Naur linux-2.6.25/arch/x86/kernel/
   	if (swiotlb)
   		swiotlb_unmap_single(dev, dma_addr, size, direction);
   	else
- diff -Naur linux-2.6.25/arch/x86/kernel/pci-swiotlb_64-xen.c linux-2.6.25-xen/arch/x86/kernel/pci-swiotlb_64-xen.c
+ --- a/arch/x86/kernel/pci-swiotlb_64-xen.c
- --- linux-2.6.25/arch/x86/kernel/pci-swiotlb_64-xen.c	2008-05-23 20:51:21.000000000 +0200
+ +++ b/arch/x86/kernel/pci-swiotlb_64-xen.c
- +++ linux-2.6.25-xen/arch/x86/kernel/pci-swiotlb_64-xen.c	2008-05-23 20:39:03.000000000 +0200
  @@ -3,7 +3,8 @@
   #include <linux/pci.h>
   #include <linux/cache.h>
-Line 5485 
 diff -Naur linux-2.6.25/arch/x86/kernel/
+Line 5563 
 diff -Naur linux-2.6.25/arch/x86/kernel/
   #include <asm/proto.h>
   #include <asm/swiotlb.h>
   #include <asm/dma.h>
- diff -Naur linux-2.6.25/arch/x86/kernel/process_32-xen.c linux-2.6.25-xen/arch/x86/kernel/process_32-xen.c
+ --- a/arch/x86/kernel/process_32-xen.c
- --- linux-2.6.25/arch/x86/kernel/process_32-xen.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/arch/x86/kernel/process_32-xen.c
- +++ linux-2.6.25-xen/arch/x86/kernel/process_32-xen.c	2008-05-23 20:39:03.000000000 +0200
  @@ -37,6 +37,7 @@
   #include <linux/kallsyms.h>
   #include <linux/ptrace.h>
-Line 5577 
 diff -Naur linux-2.6.25/arch/x86/kernel/
+Line 5654 
 diff -Naur linux-2.6.25/arch/x86/kernel/
   		sp -= get_random_int() % 8192;
   	return sp & ~0xf;
   }
- diff -Naur linux-2.6.25/arch/x86/kernel/process_64-xen.c linux-2.6.25-xen/arch/x86/kernel/process_64-xen.c
+ --- a/arch/x86/kernel/process_64-xen.c
- --- linux-2.6.25/arch/x86/kernel/process_64-xen.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/arch/x86/kernel/process_64-xen.c
- +++ linux-2.6.25-xen/arch/x86/kernel/process_64-xen.c	2008-05-23 20:39:03.000000000 +0200
  @@ -89,25 +89,24 @@
   }
   EXPORT_SYMBOL(idle_notifier_unregister);
-Line 5786 
 diff -Naur linux-2.6.25/arch/x86/kernel/
+Line 5862 
 diff -Naur linux-2.6.25/arch/x86/kernel/
   		sp -= get_random_int() % 8192;
   	return sp & ~0xf;
   }
- diff -Naur linux-2.6.25/arch/x86/kernel/setup_32-xen.c linux-2.6.25-xen/arch/x86/kernel/setup_32-xen.c
+ --- a/arch/x86/kernel/setup64-xen.c
- --- linux-2.6.25/arch/x86/kernel/setup_32-xen.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/arch/x86/kernel/setup64-xen.c
- +++ linux-2.6.25-xen/arch/x86/kernel/setup_32-xen.c	2008-05-23 20:39:03.000000000 +0200
+ @@ -31,7 +31,7 @@
+  #include <asm/hypervisor.h>
+  #endif
+ -char x86_boot_params[BOOT_PARAM_SIZE] __initdata = {0,};
+ +char x86_boot_params[BOOT_PARAM_SIZE] __initdata;
+  cpumask_t cpu_initialized __cpuinitdata = CPU_MASK_NONE;
+ @@ -55,8 +55,10 @@
+  on	Enable(default)
+  off	Disable
+  */
+ -int __init nonx_setup(char *str)
+ +static int __init nonx_setup(char *str)
+  {
+ +	if (!str)
+ +		return -EINVAL;
+  	if (!strncmp(str, "on", 2)) {
+                  __supported_pte_mask |= _PAGE_NX;
+   		do_not_nx = 0;
+ @@ -64,9 +66,9 @@
+  		do_not_nx = 1;
+  		__supported_pte_mask &= ~_PAGE_NX;
+          }
+ -	return 1;
+ +	return 0;
+  }
+ -__setup("noexec=", nonx_setup);	/* parsed early actually */
+ +early_param("noexec", nonx_setup);
+  int force_personality32 = 0;
+ @@ -102,12 +104,9 @@
+  #endif
+  	/* Copy section for each CPU (we discard the original) */
+ -	size = ALIGN(__per_cpu_end - __per_cpu_start, SMP_CACHE_BYTES);
+ -#ifdef CONFIG_MODULES
+ -	if (size < PERCPU_ENOUGH_ROOM)
+ -		size = PERCPU_ENOUGH_ROOM;
+ -#endif
+ +	size = PERCPU_ENOUGH_ROOM;
+ +	printk(KERN_INFO "PERCPU: Allocating %lu bytes of per cpu data\n", size);
+  	for_each_cpu_mask (i, cpu_possible_map) {
+  		char *ptr;
+ @@ -169,7 +168,10 @@
+  	/* Setup up data that may be needed in __get_free_pages early */
+  	asm volatile("movl %0,%%fs ; movl %0,%%gs" :: "r" (0));
+  #ifndef CONFIG_XEN
+ +	/* Memory clobbers used to order PDA accessed */
+ +	mb();
+  	wrmsrl(MSR_GS_BASE, pda);
+ +	mb();
+  #else
+  	if (HYPERVISOR_set_segment_base(SEGBASE_GS_KERNEL,
+  					(unsigned long)pda))
+ @@ -302,28 +304,17 @@
+  	 * set up and load the per-CPU TSS
+  	 */
+  	for (v = 0; v < N_EXCEPTION_STACKS; v++) {
+ +		static const unsigned int order[N_EXCEPTION_STACKS] = {
+ +			[0 ... N_EXCEPTION_STACKS - 1] = EXCEPTION_STACK_ORDER,
+ +			[DEBUG_STACK - 1] = DEBUG_STACK_ORDER
+ +		};
+  		if (cpu) {
+ -			static const unsigned int order[N_EXCEPTION_STACKS] = {
+ -				[0 ... N_EXCEPTION_STACKS - 1] = EXCEPTION_STACK_ORDER,
+ -				[DEBUG_STACK - 1] = DEBUG_STACK_ORDER
+ -			};
+ -
+  			estacks = (char *)__get_free_pages(GFP_ATOMIC, order[v]);
+  			if (!estacks)
+  				panic("Cannot allocate exception stack %ld %d\n",
+  				      v, cpu);
+  		}
+ -		switch (v + 1) {
+ -#if DEBUG_STKSZ > EXCEPTION_STKSZ
+ -		case DEBUG_STACK:
+ -			cpu_pda(cpu)->debugstack = (unsigned long)estacks;
+ -			estacks += DEBUG_STKSZ;
+ -			break;
+ -#endif
+ -		default:
+ -			estacks += EXCEPTION_STKSZ;
+ -			break;
+ -		}
+ +		estacks += PAGE_SIZE << order[v];
+  		orig_ist->ist[v] = t->ist[v] = (unsigned long)estacks;
+  	}
+ --- a/arch/x86/kernel/setup_32-xen.c
+ +++ b/arch/x86/kernel/setup_32-xen.c
  @@ -56,6 +56,7 @@
   #include <asm/apic.h>
   #include <asm/e820.h>
-Line 6070 
 diff -Naur linux-2.6.25/arch/x86/kernel/
+Line 6240 
 diff -Naur linux-2.6.25/arch/x86/kernel/
  -		else if (!memcmp(from, "acpi_sci=edge", 13))
  -			acpi_sci_flags.trigger =  1;
- -
- -		else if (!memcmp(from, "acpi_sci=level", 14))
- -			acpi_sci_flags.trigger = 3;
  +#ifdef CONFIG_PROC_VMCORE
  +/* elfcorehdr= specifies the location of elf core header
  + * stored by the crashed kernel.
-Line 6082 
 diff -Naur linux-2.6.25/arch/x86/kernel/
+Line 6249 
 diff -Naur linux-2.6.25/arch/x86/kernel/
  +	if (!arg)
  +		return -EINVAL;
- -		else if (!memcmp(from, "acpi_sci=high", 13))
+ -		else if (!memcmp(from, "acpi_sci=level", 14))
- -			acpi_sci_flags.polarity = 1;
+ -			acpi_sci_flags.trigger = 3;
  +	elfcorehdr_addr = memparse(arg, &arg);
  +	return 0;
  +}
  +early_param("elfcorehdr", parse_elfcorehdr);
  +#endif /* CONFIG_PROC_VMCORE */
- -		else if (!memcmp(from, "acpi_sci=low", 12))
+ -		else if (!memcmp(from, "acpi_sci=high", 13))
- -			acpi_sci_flags.polarity = 3;
+ -			acpi_sci_flags.polarity = 1;
  +/*
  + * highmem=size forces highmem to be exactly 'size' bytes.
  + * This works even on boxes that have no highmem otherwise.
-Line 6102 
 diff -Naur linux-2.6.25/arch/x86/kernel/
+Line 6269 
 diff -Naur linux-2.6.25/arch/x86/kernel/
  +	if (!arg)
  +		return -EINVAL;
- -#ifdef CONFIG_X86_IO_APIC
+ -		else if (!memcmp(from, "acpi_sci=low", 12))
- -		else if (!memcmp(from, "acpi_skip_timer_override", 24))
+ -			acpi_sci_flags.polarity = 3;
- -			acpi_skip_timer_override = 1;
  +	highmem_pages = memparse(arg, &arg) >> PAGE_SHIFT;
  +	return 0;
  +}
  +early_param("highmem", parse_highmem);
- -		if (!memcmp(from, "disable_timer_pin_1", 19))
+ -#ifdef CONFIG_X86_IO_APIC
- -			disable_timer_pin_1 = 1;
+ -		else if (!memcmp(from, "acpi_skip_timer_override", 24))
- -		if (!memcmp(from, "enable_timer_pin_1", 18))
+ -			acpi_skip_timer_override = 1;
- -			disable_timer_pin_1 = -1;
- -
- -		/* disable IO-APIC */
- -		else if (!memcmp(from, "noapic", 6))
- -			disable_ioapic_setup();
- -#endif /* CONFIG_X86_IO_APIC */
- -#endif /* CONFIG_ACPI */
  +/*
  + * vmalloc=size forces the vmalloc area to be exactly 'size'
  + * bytes. This can be used to increase (or decrease) the
-Line 6130 
 diff -Naur linux-2.6.25/arch/x86/kernel/
+Line 6289 
 diff -Naur linux-2.6.25/arch/x86/kernel/
  +	if (!arg)
  +		return -EINVAL;
+ -		if (!memcmp(from, "disable_timer_pin_1", 19))
+ -			disable_timer_pin_1 = 1;
+ -		if (!memcmp(from, "enable_timer_pin_1", 18))
+ -			disable_timer_pin_1 = -1;
+ -
+ -		/* disable IO-APIC */
+ -		else if (!memcmp(from, "noapic", 6))
+ -			disable_ioapic_setup();
+ -#endif /* CONFIG_X86_IO_APIC */
+ -#endif /* CONFIG_ACPI */
+ -
  -#ifdef CONFIG_X86_LOCAL_APIC
  -		/* enable local APIC */
  -		else if (!memcmp(from, "lapic", 5))
-Line 6351 
 diff -Naur linux-2.6.25/arch/x86/kernel/
+Line 6521 
 diff -Naur linux-2.6.25/arch/x86/kernel/
   #ifdef CONFIG_ACPI
   	acpi_boot_init();
- diff -Naur linux-2.6.25/arch/x86/kernel/setup64-xen.c linux-2.6.25-xen/arch/x86/kernel/setup64-xen.c
+ --- a/arch/x86/kernel/setup_64-xen.c
- --- linux-2.6.25/arch/x86/kernel/setup64-xen.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/arch/x86/kernel/setup_64-xen.c
- +++ linux-2.6.25-xen/arch/x86/kernel/setup64-xen.c	2008-05-23 20:39:03.000000000 +0200
- @@ -31,7 +31,7 @@
-  #include <asm/hypervisor.h>
-  #endif
- -char x86_boot_params[BOOT_PARAM_SIZE] __initdata = {0,};
- +char x86_boot_params[BOOT_PARAM_SIZE] __initdata;
-  cpumask_t cpu_initialized __cpuinitdata = CPU_MASK_NONE;
- @@ -55,8 +55,10 @@
-  on	Enable(default)
-  off	Disable
-  */
- -int __init nonx_setup(char *str)
- +static int __init nonx_setup(char *str)
-  {
- +	if (!str)
- +		return -EINVAL;
-  	if (!strncmp(str, "on", 2)) {
-                  __supported_pte_mask |= _PAGE_NX;
-   		do_not_nx = 0;
- @@ -64,9 +66,9 @@
-  		do_not_nx = 1;
-  		__supported_pte_mask &= ~_PAGE_NX;
-          }
- -	return 1;
- +	return 0;
-  }
- -__setup("noexec=", nonx_setup);	/* parsed early actually */
- +early_param("noexec", nonx_setup);
-  int force_personality32 = 0;
- @@ -102,12 +104,9 @@
-  #endif
-  	/* Copy section for each CPU (we discard the original) */
- -	size = ALIGN(__per_cpu_end - __per_cpu_start, SMP_CACHE_BYTES);
- -#ifdef CONFIG_MODULES
- -	if (size < PERCPU_ENOUGH_ROOM)
- -		size = PERCPU_ENOUGH_ROOM;
- -#endif
- +	size = PERCPU_ENOUGH_ROOM;
- +	printk(KERN_INFO "PERCPU: Allocating %lu bytes of per cpu data\n", size);
-  	for_each_cpu_mask (i, cpu_possible_map) {
-  		char *ptr;
- @@ -169,7 +168,10 @@
-  	/* Setup up data that may be needed in __get_free_pages early */
-  	asm volatile("movl %0,%%fs ; movl %0,%%gs" :: "r" (0));
-  #ifndef CONFIG_XEN
- +	/* Memory clobbers used to order PDA accessed */
- +	mb();
-  	wrmsrl(MSR_GS_BASE, pda);
- +	mb();
-  #else
-  	if (HYPERVISOR_set_segment_base(SEGBASE_GS_KERNEL,
-  					(unsigned long)pda))
- @@ -302,28 +304,17 @@
-  	 * set up and load the per-CPU TSS
-  	 */
-  	for (v = 0; v < N_EXCEPTION_STACKS; v++) {
- +		static const unsigned int order[N_EXCEPTION_STACKS] = {
- +			[0 ... N_EXCEPTION_STACKS - 1] = EXCEPTION_STACK_ORDER,
- +			[DEBUG_STACK - 1] = DEBUG_STACK_ORDER
- +		};
-  		if (cpu) {
- -			static const unsigned int order[N_EXCEPTION_STACKS] = {
- -				[0 ... N_EXCEPTION_STACKS - 1] = EXCEPTION_STACK_ORDER,
- -				[DEBUG_STACK - 1] = DEBUG_STACK_ORDER
- -			};
- -
-  			estacks = (char *)__get_free_pages(GFP_ATOMIC, order[v]);
-  			if (!estacks)
-  				panic("Cannot allocate exception stack %ld %d\n",
-  				      v, cpu);
-  		}
- -		switch (v + 1) {
- -#if DEBUG_STKSZ > EXCEPTION_STKSZ
- -		case DEBUG_STACK:
- -			cpu_pda(cpu)->debugstack = (unsigned long)estacks;
- -			estacks += DEBUG_STKSZ;
- -			break;
- -#endif
- -		default:
- -			estacks += EXCEPTION_STKSZ;
- -			break;
- -		}
- +		estacks += PAGE_SIZE << order[v];
-  		orig_ist->ist[v] = t->ist[v] = (unsigned long)estacks;
-  	}
- diff -Naur linux-2.6.25/arch/x86/kernel/setup_64-xen.c linux-2.6.25-xen/arch/x86/kernel/setup_64-xen.c
- --- linux-2.6.25/arch/x86/kernel/setup_64-xen.c	2008-05-23 20:51:11.000000000 +0200
- +++ linux-2.6.25-xen/arch/x86/kernel/setup_64-xen.c	2008-05-23 20:39:03.000000000 +0200
  @@ -118,16 +118,6 @@
   unsigned long mmu_cr4_features;
-Line 6873 
 diff -Naur linux-2.6.25/arch/x86/kernel/
+Line 6946 
 diff -Naur linux-2.6.25/arch/x86/kernel/
   		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   		/* VIA/Cyrix/Centaur-defined */
- diff -Naur linux-2.6.25/arch/x86/kernel/smp_32-xen.c linux-2.6.25-xen/arch/x86/kernel/smp_32-xen.c
+ --- a/arch/x86/kernel/smp_32-xen.c
- --- linux-2.6.25/arch/x86/kernel/smp_32-xen.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/arch/x86/kernel/smp_32-xen.c
- +++ linux-2.6.25-xen/arch/x86/kernel/smp_32-xen.c	2008-05-23 20:39:03.000000000 +0200
  @@ -279,8 +279,7 @@
    * 2) Leave the mm if we are in the lazy tlb mode.
    */
-Line 6975 
 diff -Naur linux-2.6.25/arch/x86/kernel/
+Line 7047 
 diff -Naur linux-2.6.25/arch/x86/kernel/
  +	return 0;
  +}
  +EXPORT_SYMBOL(smp_call_function_single);
- diff -Naur linux-2.6.25/arch/x86/kernel/smp_64-xen.c linux-2.6.25-xen/arch/x86/kernel/smp_64-xen.c
+ --- a/arch/x86/kernel/smp_64-xen.c
- --- linux-2.6.25/arch/x86/kernel/smp_64-xen.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/arch/x86/kernel/smp_64-xen.c
- +++ linux-2.6.25-xen/arch/x86/kernel/smp_64-xen.c	2008-05-23 20:39:03.000000000 +0200
  @@ -381,9 +381,8 @@
   	/* prevent preemption and reschedule on another processor */
   	int me = get_cpu();
-Line 7039 
 diff -Naur linux-2.6.25/arch/x86/kernel/
+Line 7110 
 diff -Naur linux-2.6.25/arch/x86/kernel/
  -	return 0; /* Should not happen */
  -#endif
  -}
- diff -Naur linux-2.6.25/arch/x86/kernel/time_32-xen.c linux-2.6.25-xen/arch/x86/kernel/time_32-xen.c
+ --- a/arch/x86/kernel/time_32-xen.c
- --- linux-2.6.25/arch/x86/kernel/time_32-xen.c	2008-05-23 20:51:22.000000000 +0200
+ +++ b/arch/x86/kernel/time_32-xen.c
- +++ linux-2.6.25-xen/arch/x86/kernel/time_32-xen.c	2008-05-23 20:39:03.000000000 +0200
  @@ -89,7 +89,6 @@
   unsigned long vxtime_hz = PIT_TICK_RATE;
   struct vxtime_data __vxtime __section_vxtime;   /* for vsyscalls */
-Line 7224 
 diff -Naur linux-2.6.25/arch/x86/kernel/
+Line 7294 
 diff -Naur linux-2.6.25/arch/x86/kernel/
   	if ((hpet_enable() >= 0) && hpet_use_timer) {
   		printk("Using HPET for base-timer\n");
- diff -Naur linux-2.6.25/arch/x86/kernel/traps_32-xen.c linux-2.6.25-xen/arch/x86/kernel/traps_32-xen.c
+ --- a/arch/x86/kernel/traps_32-xen.c
- --- linux-2.6.25/arch/x86/kernel/traps_32-xen.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/arch/x86/kernel/traps_32-xen.c
- +++ linux-2.6.25-xen/arch/x86/kernel/traps_32-xen.c	2008-05-23 20:39:03.000000000 +0200
  @@ -28,6 +28,7 @@
   #include <linux/kprobes.h>
   #include <linux/kexec.h>
-Line 7429 
 diff -Naur linux-2.6.25/arch/x86/kernel/
+Line 7498 
 diff -Naur linux-2.6.25/arch/x86/kernel/
   	}
   }
  +EXPORT_SYMBOL(dump_trace);
- +
+ -void show_trace(struct task_struct *task, struct pt_regs *regs, unsigned long * stack)
  +static void
  +print_trace_warning_symbol(void *data, char *msg, unsigned long symbol)
  +{
-Line 7442 
 diff -Naur linux-2.6.25/arch/x86/kernel/
+Line 7512 
 diff -Naur linux-2.6.25/arch/x86/kernel/
  +{
  +	printk("%s%s\n", (char *)data, msg);
  +}
+ +
- -void show_trace(struct task_struct *task, struct pt_regs *regs, unsigned long * stack)
  +static int print_trace_stack(void *data, char *name)
  +{
  +	return 0;
-Line 7673 
 diff -Naur linux-2.6.25/arch/x86/kernel/
+Line 7742 
 diff -Naur linux-2.6.25/arch/x86/kernel/
   #ifdef CONFIG_KPROBES
   fastcall void __kprobes do_int3(struct pt_regs *regs, long error_code)
   {
- diff -Naur linux-2.6.25/arch/x86/kernel/traps_64-xen.c linux-2.6.25-xen/arch/x86/kernel/traps_64-xen.c
+ --- a/arch/x86/kernel/traps_64-xen.c
- --- linux-2.6.25/arch/x86/kernel/traps_64-xen.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/arch/x86/kernel/traps_64-xen.c
- +++ linux-2.6.25-xen/arch/x86/kernel/traps_64-xen.c	2008-05-23 20:39:03.000000000 +0200
  @@ -23,6 +23,7 @@
   #include <linux/delay.h>
   #include <linux/spinlock.h>
-Line 8129 
 diff -Naur linux-2.6.25/arch/x86/kernel/
+Line 8197 
 diff -Naur linux-2.6.25/arch/x86/kernel/
  -__setup("call_trace=", call_trace_setup);
  +early_param("call_trace", call_trace_setup);
   #endif
- diff -Naur linux-2.6.25/arch/x86/kernel/vsyscall_64-xen.c linux-2.6.25-xen/arch/x86/kernel/vsyscall_64-xen.c
+ --- a/arch/x86/kernel/vsyscall_64-xen.c
- --- linux-2.6.25/arch/x86/kernel/vsyscall_64-xen.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/arch/x86/kernel/vsyscall_64-xen.c
- +++ linux-2.6.25-xen/arch/x86/kernel/vsyscall_64-xen.c	2008-05-23 20:39:03.000000000 +0200
  @@ -26,6 +26,10 @@
   #include <linux/seqlock.h>
   #include <linux/jiffies.h>
-Line 8325 
 diff -Naur linux-2.6.25/arch/x86/kernel/
+Line 8392 
 diff -Naur linux-2.6.25/arch/x86/kernel/
   	return 0;
   }
- diff -Naur linux-2.6.25/arch/x86/mach-xen/setup.c linux-2.6.25-xen/arch/x86/mach-xen/setup.c
+ --- a/arch/x86/mach-xen/setup.c
- --- linux-2.6.25/arch/x86/mach-xen/setup.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/arch/x86/mach-xen/setup.c
- +++ linux-2.6.25-xen/arch/x86/mach-xen/setup.c	2008-05-23 20:39:03.000000000 +0200
  @@ -103,8 +103,10 @@
   	setup_xen_features();
-Line 8341 
 diff -Naur linux-2.6.25/arch/x86/mach-xe
+Line 8407 
 diff -Naur linux-2.6.25/arch/x86/mach-xe
   	if (HYPERVISOR_memory_op(XENMEM_machphys_mapping, &mapping) == 0) {
   		machine_to_phys_mapping = (unsigned long *)mapping.v_start;
- diff -Naur linux-2.6.25/arch/x86/mm/fault_32-xen.c linux-2.6.25-xen/arch/x86/mm/fault_32-xen.c
+ --- a/arch/x86/mm/fault_32-xen.c
- --- linux-2.6.25/arch/x86/mm/fault_32-xen.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/arch/x86/mm/fault_32-xen.c
- +++ linux-2.6.25-xen/arch/x86/mm/fault_32-xen.c	2008-05-23 20:39:03.000000000 +0200
  @@ -27,21 +27,24 @@
   #include <asm/uaccess.h>
   #include <asm/desc.h>
-Line 8430 
 diff -Naur linux-2.6.25/arch/x86/mm/faul
+Line 8495 
 diff -Naur linux-2.6.25/arch/x86/mm/faul
   		yield();
   		down_read(&mm->mmap_sem);
   		goto survive;
- diff -Naur linux-2.6.25/arch/x86/mm/fault_64-xen.c linux-2.6.25-xen/arch/x86/mm/fault_64-xen.c
+ --- a/arch/x86/mm/fault_64-xen.c
- --- linux-2.6.25/arch/x86/mm/fault_64-xen.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/arch/x86/mm/fault_64-xen.c
- +++ linux-2.6.25-xen/arch/x86/mm/fault_64-xen.c	2008-05-23 20:39:03.000000000 +0200
  @@ -40,8 +40,7 @@
   #define PF_RSVD	(1<<3)
   #define PF_INSTR	(1<<4)
-Line 8570 
 diff -Naur linux-2.6.25/arch/x86/mm/faul
+Line 8634 
 diff -Naur linux-2.6.25/arch/x86/mm/faul
   			}
   			spin_unlock(&pgd_lock);
   			set_bit(pgd_index(address), insync);
- diff -Naur linux-2.6.25/arch/x86/mm/highmem_32-xen.c linux-2.6.25-xen/arch/x86/mm/highmem_32-xen.c
+ --- a/arch/x86/mm/highmem_32-xen.c
- --- linux-2.6.25/arch/x86/mm/highmem_32-xen.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/arch/x86/mm/highmem_32-xen.c
- +++ linux-2.6.25-xen/arch/x86/mm/highmem_32-xen.c	2008-05-23 20:39:03.000000000 +0200
  @@ -38,11 +38,9 @@
   	idx = type + KM_TYPE_NR*smp_processor_id();
-Line 8639 
 diff -Naur linux-2.6.25/arch/x86/mm/high
+Line 8702 
 diff -Naur linux-2.6.25/arch/x86/mm/high
   	return (void*) vaddr;
   }
- diff -Naur linux-2.6.25/arch/x86/mm/hypervisor.c linux-2.6.25-xen/arch/x86/mm/hypervisor.c
+ --- a/arch/x86/mm/hypervisor.c
- --- linux-2.6.25/arch/x86/mm/hypervisor.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/arch/x86/mm/hypervisor.c
- +++ linux-2.6.25-xen/arch/x86/mm/hypervisor.c	2008-05-23 20:39:03.000000000 +0200
  @@ -569,7 +569,8 @@
   #define MAX_BATCHED_FULL_PTES 32
-Line 8668 
 diff -Naur linux-2.6.25/arch/x86/mm/hype
+Line 8730 
 diff -Naur linux-2.6.25/arch/x86/mm/hype
   			if (++i == MAX_BATCHED_FULL_PTES) {
   				if ((rc = HYPERVISOR_mmu_update(
   					&u[0], i, NULL, DOMID_SELF)) != 0)
- diff -Naur linux-2.6.25/arch/x86/mm/init_32-xen.c linux-2.6.25-xen/arch/x86/mm/init_32-xen.c
+ --- a/arch/x86/mm/init_32-xen.c
- --- linux-2.6.25/arch/x86/mm/init_32-xen.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/arch/x86/mm/init_32-xen.c
- +++ linux-2.6.25-xen/arch/x86/mm/init_32-xen.c	2008-05-23 20:39:03.000000000 +0200
  @@ -464,16 +464,22 @@
    * on      Enable
    * off     Disable
-Line 8813 
 diff -Naur linux-2.6.25/arch/x86/mm/init
+Line 8874 
 diff -Naur linux-2.6.25/arch/x86/mm/init
   	unsigned long start_pfn = start >> PAGE_SHIFT;
   	unsigned long nr_pages = size >> PAGE_SHIFT;
- diff -Naur linux-2.6.25/arch/x86/mm/init_64-xen.c linux-2.6.25-xen/arch/x86/mm/init_64-xen.c
+ --- a/arch/x86/mm/init_64-xen.c
- --- linux-2.6.25/arch/x86/mm/init_64-xen.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/arch/x86/mm/init_64-xen.c
- +++ linux-2.6.25-xen/arch/x86/mm/init_64-xen.c	2008-05-23 20:39:03.000000000 +0200
  @@ -61,8 +61,6 @@
   extern unsigned long *contiguous_bitmap;
-Line 9127 
 diff -Naur linux-2.6.25/arch/x86/mm/init
+Line 9187 
 diff -Naur linux-2.6.25/arch/x86/mm/init
   }
   int kern_addr_valid(unsigned long addr)
- diff -Naur linux-2.6.25/arch/x86/mm/ioremap_32-xen.c linux-2.6.25-xen/arch/x86/mm/ioremap_32-xen.c
+ --- a/arch/x86/mm/ioremap_32-xen.c
- --- linux-2.6.25/arch/x86/mm/ioremap_32-xen.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/arch/x86/mm/ioremap_32-xen.c
- +++ linux-2.6.25-xen/arch/x86/mm/ioremap_32-xen.c	2008-05-23 20:39:03.000000000 +0200
  @@ -12,7 +12,7 @@
   #include <linux/init.h>
   #include <linux/slab.h>
-Line 9177 
 diff -Naur linux-2.6.25/arch/x86/mm/iore
+Line 9236 
 diff -Naur linux-2.6.25/arch/x86/mm/iore
   		vunmap((void __force *) addr);
   		return NULL;
   	}
- diff -Naur linux-2.6.25/arch/x86/mm/pageattr_64-xen.c linux-2.6.25-xen/arch/x86/mm/pageattr_64-xen.c
+ --- a/arch/x86/mm/pageattr_64-xen.c
- --- linux-2.6.25/arch/x86/mm/pageattr_64-xen.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/arch/x86/mm/pageattr_64-xen.c
- +++ linux-2.6.25-xen/arch/x86/mm/pageattr_64-xen.c	2008-05-23 20:39:03.000000000 +0200
  @@ -371,8 +371,8 @@
   	BUG_ON(pud_none(*pud));
   	pmd = pmd_offset(pud, address);
-Line 9244 
 diff -Naur linux-2.6.25/arch/x86/mm/page
+Line 9302 
 diff -Naur linux-2.6.25/arch/x86/mm/page
   		}
   	}
   	up_write(&init_mm.mmap_sem);
- diff -Naur linux-2.6.25/arch/x86/mm/pgtable_32-xen.c linux-2.6.25-xen/arch/x86/mm/pgtable_32-xen.c
+ --- a/arch/x86/mm/pgtable_32-xen.c
- --- linux-2.6.25/arch/x86/mm/pgtable_32-xen.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/arch/x86/mm/pgtable_32-xen.c
- +++ linux-2.6.25-xen/arch/x86/mm/pgtable_32-xen.c	2008-05-23 20:39:03.000000000 +0200
  @@ -68,7 +68,9 @@
   	printk(KERN_INFO "%lu pages writeback\n",
   					global_page_state(NR_WRITEBACK));
-Line 9302 
 diff -Naur linux-2.6.25/arch/x86/mm/pgta
+Line 9359 
 diff -Naur linux-2.6.25/arch/x86/mm/pgta
   }
   pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
- diff -Naur linux-2.6.25/arch/x86/pci/irq-xen.c linux-2.6.25-xen/arch/x86/pci/irq-xen.c
+ --- a/arch/x86/pci/irq-xen.c
- --- linux-2.6.25/arch/x86/pci/irq-xen.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/arch/x86/pci/irq-xen.c
- +++ linux-2.6.25-xen/arch/x86/pci/irq-xen.c	2008-05-23 20:39:03.000000000 +0200
  @@ -991,10 +991,6 @@
   							pci_name(bridge), 'A' + pin, irq);
   				}
-Line 9361 
 diff -Naur linux-2.6.25/arch/x86/pci/irq
+Line 9417 
 diff -Naur linux-2.6.25/arch/x86/pci/irq
  -
  -	return count;
  -}
- diff -Naur linux-2.6.25/drivers/char/tpm/tpm_xen.c linux-2.6.25-xen/drivers/char/tpm/tpm_xen.c
+ --- a/drivers/char/tpm/tpm_xen.c
- --- linux-2.6.25/drivers/char/tpm/tpm_xen.c	2008-05-23 20:51:15.000000000 +0200
+ +++ b/drivers/char/tpm/tpm_xen.c
- +++ linux-2.6.25-xen/drivers/char/tpm/tpm_xen.c	2008-05-23 20:39:03.000000000 +0200
  @@ -85,8 +85,7 @@
   /* local function prototypes */
-Line 9383 
 diff -Naur linux-2.6.25/drivers/char/tpm
+Line 9438 
 diff -Naur linux-2.6.25/drivers/char/tpm
   {
   	struct tpm_private *tp = tpm_priv;
   	unsigned long flags;
- diff -Naur linux-2.6.25/drivers/pci/Kconfig linux-2.6.25-xen/drivers/pci/Kconfig
+ --- a/drivers/pci/Kconfig
- --- linux-2.6.25/drivers/pci/Kconfig	2008-04-17 04:49:44.000000000 +0200
+ +++ b/drivers/pci/Kconfig
- +++ linux-2.6.25-xen/drivers/pci/Kconfig	2008-05-23 20:39:03.000000000 +0200
  @@ -45,7 +45,7 @@
   config HT_IRQ
   	bool "Interrupts on hypertransport devices"
-Line 9395 
 diff -Naur linux-2.6.25/drivers/pci/Kcon
+Line 9449 
 diff -Naur linux-2.6.25/drivers/pci/Kcon
   	help
   	   This allows native hypertransport devices to use interrupts.
- diff -Naur linux-2.6.25/drivers/xen/balloon/balloon.c linux-2.6.25-xen/drivers/xen/balloon/balloon.c
+ --- a/drivers/xen/Kconfig
- --- linux-2.6.25/drivers/xen/balloon/balloon.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/drivers/xen/Kconfig
- +++ linux-2.6.25-xen/drivers/xen/balloon/balloon.c	2008-05-23 20:39:03.000000000 +0200
+ @@ -278,6 +278,9 @@
+  config HAVE_IRQ_IGNORE_UNHANDLED
+  	def_bool y
+ +config GENERIC_HARDIRQS_NO__DO_IRQ
+ +	def_bool y
+ +
+  config NO_IDLE_HZ
+  	def_bool y
+ --- a/drivers/xen/balloon/balloon.c
+ +++ b/drivers/xen/balloon/balloon.c
  @@ -84,7 +84,7 @@
   /* VM /proc information for memory */
   extern unsigned long totalram_pages;
-Line 9407 
 diff -Naur linux-2.6.25/drivers/xen/ball
+Line 9472 
 diff -Naur linux-2.6.25/drivers/xen/ball
   extern unsigned long totalhigh_pages;
   #define inc_totalhigh_pages() (totalhigh_pages++)
   #define dec_totalhigh_pages() (totalhigh_pages--)
- diff -Naur linux-2.6.25/drivers/xen/blkback/blkback.c linux-2.6.25-xen/drivers/xen/blkback/blkback.c
+ --- a/drivers/xen/blkback/blkback.c
- --- linux-2.6.25/drivers/xen/blkback/blkback.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/drivers/xen/blkback/blkback.c
- +++ linux-2.6.25-xen/drivers/xen/blkback/blkback.c	2008-05-23 20:39:03.000000000 +0200
  @@ -288,7 +288,7 @@
   	wake_up(&blkif->wq);
   }
-Line 9419 
 diff -Naur linux-2.6.25/drivers/xen/blkb
+Line 9483 
 diff -Naur linux-2.6.25/drivers/xen/blkb
   {
   	blkif_notify_work(dev_id);
   	return IRQ_HANDLED;
- diff -Naur linux-2.6.25/drivers/xen/blkback/common.h linux-2.6.25-xen/drivers/xen/blkback/common.h
+ --- a/drivers/xen/blkback/common.h
- --- linux-2.6.25/drivers/xen/blkback/common.h	2008-05-23 20:51:11.000000000 +0200
+ +++ b/drivers/xen/blkback/common.h
- +++ linux-2.6.25-xen/drivers/xen/blkback/common.h	2008-05-23 20:39:03.000000000 +0200
  @@ -130,7 +130,7 @@
   void blkif_xenbus_init(void);
-Line 9431 
 diff -Naur linux-2.6.25/drivers/xen/blkb
+Line 9494 
 diff -Naur linux-2.6.25/drivers/xen/blkb
   int blkif_schedule(void *arg);
   int blkback_barrier(struct xenbus_transaction xbt,
- diff -Naur linux-2.6.25/drivers/xen/blkfront/blkfront.c linux-2.6.25-xen/drivers/xen/blkfront/blkfront.c
+ --- a/drivers/xen/blkfront/blkfront.c
- --- linux-2.6.25/drivers/xen/blkfront/blkfront.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/drivers/xen/blkfront/blkfront.c
- +++ linux-2.6.25-xen/drivers/xen/blkfront/blkfront.c	2008-05-23 20:39:03.000000000 +0200
  @@ -69,7 +69,7 @@
   static void kick_pending_request_queues(struct blkfront_info *);
-Line 9452 
 diff -Naur linux-2.6.25/drivers/xen/blkf
+Line 9514 
 diff -Naur linux-2.6.25/drivers/xen/blkf
   {
   	struct request *req;
   	blkif_response_t *bret;
- diff -Naur linux-2.6.25/drivers/xen/blktap/blktap.c linux-2.6.25-xen/drivers/xen/blktap/blktap.c
+ --- a/drivers/xen/blktap/blktap.c
- --- linux-2.6.25/drivers/xen/blktap/blktap.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/drivers/xen/blktap/blktap.c
- +++ linux-2.6.25-xen/drivers/xen/blktap/blktap.c	2008-05-23 20:39:03.000000000 +0200
  @@ -1175,7 +1175,7 @@
   	wake_up(&blkif->wq);
   }
-Line 9464 
 diff -Naur linux-2.6.25/drivers/xen/blkt
+Line 9525 
 diff -Naur linux-2.6.25/drivers/xen/blkt
   {
   	blkif_notify_work(dev_id);
   	return IRQ_HANDLED;
- diff -Naur linux-2.6.25/drivers/xen/blktap/common.h linux-2.6.25-xen/drivers/xen/blktap/common.h
+ --- a/drivers/xen/blktap/common.h
- --- linux-2.6.25/drivers/xen/blktap/common.h	2008-05-23 20:51:11.000000000 +0200
+ +++ b/drivers/xen/blktap/common.h
- +++ linux-2.6.25-xen/drivers/xen/blktap/common.h	2008-05-23 20:39:03.000000000 +0200
  @@ -112,7 +112,7 @@
   void tap_blkif_xenbus_init(void);
-Line 9476 
 diff -Naur linux-2.6.25/drivers/xen/blkt
+Line 9536 
 diff -Naur linux-2.6.25/drivers/xen/blkt
   int tap_blkif_schedule(void *arg);
   int dom_to_devid(domid_t domid, int xenbus_id, blkif_t *blkif);
- diff -Naur linux-2.6.25/drivers/xen/console/console.c linux-2.6.25-xen/drivers/xen/console/console.c
+ --- a/drivers/xen/console/console.c
- --- linux-2.6.25/drivers/xen/console/console.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/drivers/xen/console/console.c
- +++ linux-2.6.25-xen/drivers/xen/console/console.c	2008-05-23 20:39:03.000000000 +0200
  @@ -345,7 +345,7 @@
   static int xencons_priv_irq;
   static char x_char;
-Line 9515 
 diff -Naur linux-2.6.25/drivers/xen/cons
+Line 9574 
 diff -Naur linux-2.6.25/drivers/xen/cons
   	xencons_tx();
- diff -Naur linux-2.6.25/drivers/xen/console/xencons_ring.c linux-2.6.25-xen/drivers/xen/console/xencons_ring.c
+ --- a/drivers/xen/console/xencons_ring.c
- --- linux-2.6.25/drivers/xen/console/xencons_ring.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/drivers/xen/console/xencons_ring.c
- +++ linux-2.6.25-xen/drivers/xen/console/xencons_ring.c	2008-05-23 20:39:03.000000000 +0200
  @@ -83,7 +83,7 @@
   	return sent;
   }
-Line 9536 
 diff -Naur linux-2.6.25/drivers/xen/cons
+Line 9594 
 diff -Naur linux-2.6.25/drivers/xen/cons
   		cons++;
   	}
- diff -Naur linux-2.6.25/drivers/xen/core/evtchn.c linux-2.6.25-xen/drivers/xen/core/evtchn.c
+ --- a/drivers/xen/core/evtchn.c
- --- linux-2.6.25/drivers/xen/core/evtchn.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/drivers/xen/core/evtchn.c
- +++ linux-2.6.25-xen/drivers/xen/core/evtchn.c	2008-05-23 20:39:03.000000000 +0200
  @@ -507,7 +507,7 @@
   int bind_caller_port_to_irqhandler(
-Line 9680 
 diff -Naur linux-2.6.25/drivers/xen/core
+Line 9737 
 diff -Naur linux-2.6.25/drivers/xen/core
  +		                              handle_level_irq, "level");
   	}
   }
- diff -Naur linux-2.6.25/drivers/xen/core/reboot.c linux-2.6.25-xen/drivers/xen/core/reboot.c
+ --- a/drivers/xen/core/reboot.c
- --- linux-2.6.25/drivers/xen/core/reboot.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/drivers/xen/core/reboot.c
- +++ linux-2.6.25-xen/drivers/xen/core/reboot.c	2008-05-23 20:39:03.000000000 +0200
  @@ -13,6 +13,7 @@
   #ifdef HAVE_XEN_PLATFORM_COMPAT_H
-Line 9700 
 diff -Naur linux-2.6.25/drivers/xen/core
+Line 9756 
 diff -Naur linux-2.6.25/drivers/xen/core
   #endif
   }
- diff -Naur linux-2.6.25/drivers/xen/core/smpboot.c linux-2.6.25-xen/drivers/xen/core/smpboot.c
+ --- a/drivers/xen/core/smpboot.c
- --- linux-2.6.25/drivers/xen/core/smpboot.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/drivers/xen/core/smpboot.c
- +++ linux-2.6.25-xen/drivers/xen/core/smpboot.c	2008-05-23 20:39:03.000000000 +0200
  @@ -25,8 +25,8 @@
   #include <xen/cpu_hotplug.h>
   #include <xen/xenbus.h>
-Line 9723 
 diff -Naur linux-2.6.25/drivers/xen/core
+Line 9778 
 diff -Naur linux-2.6.25/drivers/xen/core
   #endif
   void __init prefill_possible_map(void)
- diff -Naur linux-2.6.25/drivers/xen/fbfront/xenfb.c linux-2.6.25-xen/drivers/xen/fbfront/xenfb.c
+ --- a/drivers/xen/fbfront/xenfb.c
- --- linux-2.6.25/drivers/xen/fbfront/xenfb.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/drivers/xen/fbfront/xenfb.c
- +++ linux-2.6.25-xen/drivers/xen/fbfront/xenfb.c	2008-05-23 20:39:03.000000000 +0200
  @@ -523,8 +523,7 @@
   	.fb_set_par     = xenfb_set_par,
   };
-Line 9736 
 diff -Naur linux-2.6.25/drivers/xen/fbfr
+Line 9790 
 diff -Naur linux-2.6.25/drivers/xen/fbfr
   {
   	/*
   	 * No in events recognized, simply ignore them all.
- diff -Naur linux-2.6.25/drivers/xen/fbfront/xenkbd.c linux-2.6.25-xen/drivers/xen/fbfront/xenkbd.c
+ --- a/drivers/xen/fbfront/xenkbd.c
- --- linux-2.6.25/drivers/xen/fbfront/xenkbd.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/drivers/xen/fbfront/xenkbd.c
- +++ linux-2.6.25-xen/drivers/xen/fbfront/xenkbd.c	2008-05-23 20:39:03.000000000 +0200
  @@ -46,7 +46,7 @@
    * to do that.
    */
-Line 9748 
 diff -Naur linux-2.6.25/drivers/xen/fbfr
+Line 9801 
 diff -Naur linux-2.6.25/drivers/xen/fbfr
   {
   	struct xenkbd_info *info = dev_id;
   	struct xenkbd_page *page = info->page;
- diff -Naur linux-2.6.25/drivers/xen/gntdev/gntdev.c linux-2.6.25-xen/drivers/xen/gntdev/gntdev.c
+ --- a/drivers/xen/gntdev/gntdev.c
- --- linux-2.6.25/drivers/xen/gntdev/gntdev.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/drivers/xen/gntdev/gntdev.c
- +++ linux-2.6.25-xen/drivers/xen/gntdev/gntdev.c	2008-05-23 20:39:03.000000000 +0200
  @@ -755,9 +755,6 @@
   		BUG();
   	}
-Line 9790 
 diff -Naur linux-2.6.25/drivers/xen/gntd
+Line 9842 
 diff -Naur linux-2.6.25/drivers/xen/gntd
   	}
   	return copy;
- diff -Naur linux-2.6.25/drivers/xen/Kconfig linux-2.6.25-xen/drivers/xen/Kconfig
+ --- a/drivers/xen/netback/accel.c
- --- linux-2.6.25/drivers/xen/Kconfig	2008-05-23 20:51:14.000000000 +0200
+ +++ b/drivers/xen/netback/accel.c
- +++ linux-2.6.25-xen/drivers/xen/Kconfig	2008-05-23 20:39:03.000000000 +0200
- @@ -278,6 +278,9 @@
-  config HAVE_IRQ_IGNORE_UNHANDLED
-  	def_bool y
- +config GENERIC_HARDIRQS_NO__DO_IRQ
- +	def_bool y
- +
-  config NO_IDLE_HZ
-  	def_bool y
- diff -Naur linux-2.6.25/drivers/xen/netback/accel.c linux-2.6.25-xen/drivers/xen/netback/accel.c
- --- linux-2.6.25/drivers/xen/netback/accel.c	2008-05-23 20:51:11.000000000 +0200
- +++ linux-2.6.25-xen/drivers/xen/netback/accel.c	2008-05-23 20:39:03.000000000 +0200
  @@ -65,7 +65,7 @@
   	if (IS_ERR(eth_name)) {
-Line 9815 
 diff -Naur linux-2.6.25/drivers/xen/netb
+Line 9853 
 diff -Naur linux-2.6.25/drivers/xen/netb
   			__FUNCTION__, PTR_ERR(eth_name));
   		return 0;
   	} else {
- diff -Naur linux-2.6.25/drivers/xen/netback/common.h linux-2.6.25-xen/drivers/xen/netback/common.h
+ --- a/drivers/xen/netback/common.h
- --- linux-2.6.25/drivers/xen/netback/common.h	2008-05-23 20:51:11.000000000 +0200
+ +++ b/drivers/xen/netback/common.h
- +++ linux-2.6.25-xen/drivers/xen/netback/common.h	2008-05-23 20:39:03.000000000 +0200
  @@ -200,7 +200,7 @@
   int netif_be_start_xmit(struct sk_buff *skb, struct net_device *dev);
-Line 9827 
 diff -Naur linux-2.6.25/drivers/xen/netb
+Line 9864 
 diff -Naur linux-2.6.25/drivers/xen/netb
   static inline int netbk_can_queue(struct net_device *dev)
   {
- diff -Naur linux-2.6.25/drivers/xen/netback/loopback.c linux-2.6.25-xen/drivers/xen/netback/loopback.c
+ --- a/drivers/xen/netback/loopback.c
- --- linux-2.6.25/drivers/xen/netback/loopback.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/drivers/xen/netback/loopback.c
- +++ linux-2.6.25-xen/drivers/xen/netback/loopback.c	2008-05-23 20:39:03.000000000 +0200
  @@ -151,7 +151,7 @@
   	np->stats.rx_bytes += skb->len;
   	np->stats.rx_packets++;
-Line 9839 
 diff -Naur linux-2.6.25/drivers/xen/netb
+Line 9875 
 diff -Naur linux-2.6.25/drivers/xen/netb
   		/* Defer checksum calculation. */
   		skb->proto_csum_blank = 1;
   		/* Must be a local packet: assert its integrity. */
- diff -Naur linux-2.6.25/drivers/xen/netback/netback.c linux-2.6.25-xen/drivers/xen/netback/netback.c
+ --- a/drivers/xen/netback/netback.c
- --- linux-2.6.25/drivers/xen/netback/netback.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/drivers/xen/netback/netback.c
- +++ linux-2.6.25-xen/drivers/xen/netback/netback.c	2008-05-23 20:39:03.000000000 +0200
  @@ -677,7 +677,7 @@
   		id = meta[npo.meta_cons].id;
   		flags = nr_frags ? NETRXF_more_data : 0;
-Line 9869 
 diff -Naur linux-2.6.25/drivers/xen/netb
+Line 9904 
 diff -Naur linux-2.6.25/drivers/xen/netb
   {
   	struct list_head *ent;
   	netif_t *netif;
- diff -Naur linux-2.6.25/drivers/xen/netfront/netfront.c linux-2.6.25-xen/drivers/xen/netfront/netfront.c
+ --- a/drivers/xen/netfront/netfront.c
- --- linux-2.6.25/drivers/xen/netfront/netfront.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/drivers/xen/netfront/netfront.c
- +++ linux-2.6.25-xen/drivers/xen/netfront/netfront.c	2008-05-23 20:39:03.000000000 +0200
  @@ -136,7 +136,7 @@
   {
           return skb_is_gso(skb) &&
-Line 9908 
 diff -Naur linux-2.6.25/drivers/xen/netf
+Line 9942 
 diff -Naur linux-2.6.25/drivers/xen/netf
   {
   	struct net_device *dev = dev_id;
   	struct netfront_info *np = netdev_priv(dev);
- diff -Naur linux-2.6.25/drivers/xen/pciback/pciback.h linux-2.6.25-xen/drivers/xen/pciback/pciback.h
+ --- a/drivers/xen/pciback/pciback.h
- --- linux-2.6.25/drivers/xen/pciback/pciback.h	2008-05-23 20:51:11.000000000 +0200
+ +++ b/drivers/xen/pciback/pciback.h
- +++ linux-2.6.25-xen/drivers/xen/pciback/pciback.h	2008-05-23 20:39:03.000000000 +0200
  @@ -87,7 +87,7 @@
   void pciback_release_devices(struct pciback_device *pdev);
-Line 9920 
 diff -Naur linux-2.6.25/drivers/xen/pcib
+Line 9953 
 diff -Naur linux-2.6.25/drivers/xen/pcib
   void pciback_do_op(void *data);
   int pciback_xenbus_register(void);
- diff -Naur linux-2.6.25/drivers/xen/pciback/pciback_ops.c linux-2.6.25-xen/drivers/xen/pciback/pciback_ops.c
+ --- a/drivers/xen/pciback/pciback_ops.c
- --- linux-2.6.25/drivers/xen/pciback/pciback_ops.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/drivers/xen/pciback/pciback_ops.c
- +++ linux-2.6.25-xen/drivers/xen/pciback/pciback_ops.c	2008-05-23 20:39:03.000000000 +0200
  @@ -85,7 +85,7 @@
   	test_and_schedule_op(pdev);
   }
-Line 9932 
 diff -Naur linux-2.6.25/drivers/xen/pcib
+Line 9964 
 diff -Naur linux-2.6.25/drivers/xen/pcib
   {
   	struct pciback_device *pdev = dev_id;
- diff -Naur linux-2.6.25/drivers/xen/pcifront/pci_op.c linux-2.6.25-xen/drivers/xen/pcifront/pci_op.c
+ --- a/drivers/xen/pcifront/pci_op.c
- --- linux-2.6.25/drivers/xen/pcifront/pci_op.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/drivers/xen/pcifront/pci_op.c
- +++ linux-2.6.25-xen/drivers/xen/pcifront/pci_op.c	2008-05-23 20:39:03.000000000 +0200
  @@ -392,10 +392,16 @@
   		d = pci_scan_single_device(b, devfn);
-Line 9953 
 diff -Naur linux-2.6.25/drivers/xen/pcif
+Line 9984 
 diff -Naur linux-2.6.25/drivers/xen/pcif
   		}
   	}
- diff -Naur linux-2.6.25/drivers/xen/privcmd/compat_privcmd.c linux-2.6.25-xen/drivers/xen/privcmd/compat_privcmd.c
+ --- a/drivers/xen/privcmd/compat_privcmd.c
- --- linux-2.6.25/drivers/xen/privcmd/compat_privcmd.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/drivers/xen/privcmd/compat_privcmd.c
- +++ linux-2.6.25-xen/drivers/xen/privcmd/compat_privcmd.c	2008-05-23 20:39:03.000000000 +0200
  @@ -18,7 +18,6 @@
    * Authors: Jimi Xenidis <jimix@watson.ibm.com>
    */
-Line 9964 
 diff -Naur linux-2.6.25/drivers/xen/priv
+Line 9994 
 diff -Naur linux-2.6.25/drivers/xen/priv
   #include <linux/compat.h>
   #include <linux/ioctl.h>
   #include <linux/syscalls.h>
- diff -Naur linux-2.6.25/drivers/xen/privcmd/privcmd.c linux-2.6.25-xen/drivers/xen/privcmd/privcmd.c
+ --- a/drivers/xen/privcmd/privcmd.c
- --- linux-2.6.25/drivers/xen/privcmd/privcmd.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/drivers/xen/privcmd/privcmd.c
- +++ linux-2.6.25-xen/drivers/xen/privcmd/privcmd.c	2008-05-23 20:39:03.000000000 +0200
  @@ -236,7 +236,7 @@
   #endif
-Line 9976 
 diff -Naur linux-2.6.25/drivers/xen/priv
+Line 10005 
 diff -Naur linux-2.6.25/drivers/xen/priv
   	vma->vm_ops = &privcmd_vm_ops;
   	vma->vm_private_data = NULL;
- diff -Naur linux-2.6.25/drivers/xen/sfc_netback/accel_xenbus.c linux-2.6.25-xen/drivers/xen/sfc_netback/accel_xenbus.c
+ --- a/drivers/xen/sfc_netback/accel_xenbus.c
- --- linux-2.6.25/drivers/xen/sfc_netback/accel_xenbus.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/drivers/xen/sfc_netback/accel_xenbus.c
- +++ linux-2.6.25-xen/drivers/xen/sfc_netback/accel_xenbus.c	2008-05-23 20:39:03.000000000 +0200
  @@ -68,8 +68,7 @@
-Line 9999 
 diff -Naur linux-2.6.25/drivers/xen/sfc_
+Line 10027 
 diff -Naur linux-2.6.25/drivers/xen/sfc_
   {
   	VPRINTK("netirq %d from device %s\n", irq,
   		((struct xenbus_device *)context)->nodename);
- diff -Naur linux-2.6.25/drivers/xen/sfc_netfront/accel.h linux-2.6.25-xen/drivers/xen/sfc_netfront/accel.h
+ --- a/drivers/xen/sfc_netfront/accel.h
- --- linux-2.6.25/drivers/xen/sfc_netfront/accel.h	2008-05-23 20:51:11.000000000 +0200
+ +++ b/drivers/xen/sfc_netfront/accel.h
- +++ linux-2.6.25-xen/drivers/xen/sfc_netfront/accel.h	2008-05-23 20:39:03.000000000 +0200
  @@ -449,10 +449,8 @@
   				    u32 ip, u16 port, u8 protocol);
-Line 10015 
 diff -Naur linux-2.6.25/drivers/xen/sfc_
+Line 10042 
 diff -Naur linux-2.6.25/drivers/xen/sfc_
   #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
   extern void netfront_accel_msg_from_bend(struct work_struct *context);
- diff -Naur linux-2.6.25/drivers/xen/sfc_netfront/accel_msg.c linux-2.6.25-xen/drivers/xen/sfc_netfront/accel_msg.c
+ --- a/drivers/xen/sfc_netfront/accel_msg.c
- --- linux-2.6.25/drivers/xen/sfc_netfront/accel_msg.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/drivers/xen/sfc_netfront/accel_msg.c
- +++ linux-2.6.25-xen/drivers/xen/sfc_netfront/accel_msg.c	2008-05-23 20:39:03.000000000 +0200
  @@ -490,8 +490,7 @@
   }
-Line 10038 
 diff -Naur linux-2.6.25/drivers/xen/sfc_
+Line 10064 
 diff -Naur linux-2.6.25/drivers/xen/sfc_
   {
   	netfront_accel_vnic *vnic = (netfront_accel_vnic *)context;
   	struct net_device *net_dev = vnic->net_dev;
- diff -Naur linux-2.6.25/drivers/xen/sfc_netfront/accel_tso.c linux-2.6.25-xen/drivers/xen/sfc_netfront/accel_tso.c
+ --- a/drivers/xen/sfc_netfront/accel_tso.c
- --- linux-2.6.25/drivers/xen/sfc_netfront/accel_tso.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/drivers/xen/sfc_netfront/accel_tso.c
- +++ linux-2.6.25-xen/drivers/xen/sfc_netfront/accel_tso.c	2008-05-23 20:39:03.000000000 +0200
  @@ -363,7 +363,7 @@
   	tso_check_safe(skb);
-Line 10050 
 diff -Naur linux-2.6.25/drivers/xen/sfc_
+Line 10075 
 diff -Naur linux-2.6.25/drivers/xen/sfc_
   		EPRINTK("Trying to TSO send a packet without HW checksum\n");
   	tso_start(&state, skb);
- diff -Naur linux-2.6.25/drivers/xen/sfc_netfront/accel_vi.c linux-2.6.25-xen/drivers/xen/sfc_netfront/accel_vi.c
+ --- a/drivers/xen/sfc_netfront/accel_vi.c
- --- linux-2.6.25/drivers/xen/sfc_netfront/accel_vi.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/drivers/xen/sfc_netfront/accel_vi.c
- +++ linux-2.6.25-xen/drivers/xen/sfc_netfront/accel_vi.c	2008-05-23 20:39:03.000000000 +0200
  @@ -461,7 +461,7 @@
   	frag_i = -1;
-Line 10071 
 diff -Naur linux-2.6.25/drivers/xen/sfc_
+Line 10095 
 diff -Naur linux-2.6.25/drivers/xen/sfc_
   		/* Set to zero to encourage falcon to work it out for us */
   		*(u16*)(skb->h.raw + skb->csum) = 0;
   	}
- diff -Naur linux-2.6.25/drivers/xen/tpmback/common.h linux-2.6.25-xen/drivers/xen/tpmback/common.h
+ --- a/drivers/xen/tpmback/common.h
- --- linux-2.6.25/drivers/xen/tpmback/common.h	2008-05-23 20:51:11.000000000 +0200
+ +++ b/drivers/xen/tpmback/common.h
- +++ linux-2.6.25-xen/drivers/xen/tpmback/common.h	2008-05-23 20:39:03.000000000 +0200
  @@ -61,7 +61,7 @@
   void tpmif_xenbus_init(void);
   void tpmif_xenbus_exit(void);
-Line 10083 
 diff -Naur linux-2.6.25/drivers/xen/tpmb
+Line 10106 
 diff -Naur linux-2.6.25/drivers/xen/tpmb
   long int tpmback_get_instance(struct backend_info *bi);
- diff -Naur linux-2.6.25/drivers/xen/tpmback/tpmback.c linux-2.6.25-xen/drivers/xen/tpmback/tpmback.c
+ --- a/drivers/xen/tpmback/tpmback.c
- --- linux-2.6.25/drivers/xen/tpmback/tpmback.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/drivers/xen/tpmback/tpmback.c
- +++ linux-2.6.25-xen/drivers/xen/tpmback/tpmback.c	2008-05-23 20:39:03.000000000 +0200
  @@ -502,7 +502,7 @@
   		list_del(&pak->next);
   		write_unlock_irqrestore(&dataex.pak_lock, flags);
-Line 10104 
 diff -Naur linux-2.6.25/drivers/xen/tpmb
+Line 10126 
 diff -Naur linux-2.6.25/drivers/xen/tpmb
   {
   	tpmif_t *tpmif = (tpmif_t *) dev_id;
- diff -Naur linux-2.6.25/drivers/xen/xenbus/xenbus_comms.c linux-2.6.25-xen/drivers/xen/xenbus/xenbus_comms.c
+ --- a/drivers/xen/xenbus/xenbus_comms.c
- --- linux-2.6.25/drivers/xen/xenbus/xenbus_comms.c	2008-05-23 20:51:19.000000000 +0200
+ +++ b/drivers/xen/xenbus/xenbus_comms.c
- +++ linux-2.6.25-xen/drivers/xen/xenbus/xenbus_comms.c	2008-05-23 20:39:03.000000000 +0200
  @@ -55,7 +55,7 @@
   static DECLARE_WAIT_QUEUE_HEAD(xb_waitq);
-Line 10116 
 diff -Naur linux-2.6.25/drivers/xen/xenb
+Line 10137 
 diff -Naur linux-2.6.25/drivers/xen/xenb
   {
   	if (unlikely(xenstored_ready == 0)) {
   		xenstored_ready = 1;
- diff -Naur linux-2.6.25/drivers/xen/xenoprof/xenoprofile.c linux-2.6.25-xen/drivers/xen/xenoprof/xenoprofile.c
+ --- a/drivers/xen/xenoprof/xenoprofile.c
- --- linux-2.6.25/drivers/xen/xenoprof/xenoprofile.c	2008-05-23 20:51:11.000000000 +0200
+ +++ b/drivers/xen/xenoprof/xenoprofile.c
- +++ linux-2.6.25-xen/drivers/xen/xenoprof/xenoprofile.c	2008-05-23 20:39:03.000000000 +0200
  @@ -195,7 +195,7 @@
   }
-Line 10128 
 diff -Naur linux-2.6.25/drivers/xen/xeno
+Line 10148 
 diff -Naur linux-2.6.25/drivers/xen/xeno
   {
   	struct xenoprof_buf * buf;
   	static unsigned long flag;
- diff -Naur linux-2.6.25/include/asm-generic/pgtable.h linux-2.6.25-xen/include/asm-generic/pgtable.h
+ --- a/include/asm-generic/pgtable.h
- --- linux-2.6.25/include/asm-generic/pgtable.h	2008-05-23 20:51:15.000000000 +0200
+ +++ b/include/asm-generic/pgtable.h
- +++ linux-2.6.25-xen/include/asm-generic/pgtable.h	2008-05-23 20:39:03.000000000 +0200
  @@ -100,7 +100,7 @@
   #endif
-Line 10140 
 diff -Naur linux-2.6.25/include/asm-gene
+Line 10159 
 diff -Naur linux-2.6.25/include/asm-gene
   #endif
   #ifndef __HAVE_ARCH_PTE_SAME
- diff -Naur linux-2.6.25/include/asm-x86/mach-xen/asm/desc_32.h linux-2.6.25-xen/include/asm-x86/mach-xen/asm/desc_32.h
+ --- a/include/asm-x86/mach-xen/asm/desc_32.h
- --- linux-2.6.25/include/asm-x86/mach-xen/asm/desc_32.h	2008-05-23 20:51:11.000000000 +0200
+ +++ b/include/asm-x86/mach-xen/asm/desc_32.h
- +++ linux-2.6.25-xen/include/asm-x86/mach-xen/asm/desc_32.h	2008-05-23 20:39:03.000000000 +0200
  @@ -32,52 +32,110 @@
   	return (struct desc_struct *)per_cpu(cpu_gdt_descr, cpu).address;
   }
-Line 10303 
 diff -Naur linux-2.6.25/include/asm-x86/
+Line 10321 
 diff -Naur linux-2.6.25/include/asm-x86/
   static inline void clear_LDT(void)
   {
   	int cpu = get_cpu();
- diff -Naur linux-2.6.25/include/asm-x86/mach-xen/asm/dma-mapping_64.h linux-2.6.25-xen/include/asm-x86/mach-xen/asm/dma-mapping_64.h
+ --- a/include/asm-x86/mach-xen/asm/dma-mapping_64.h
- --- linux-2.6.25/include/asm-x86/mach-xen/asm/dma-mapping_64.h	2008-05-23 20:51:11.000000000 +0200
+ +++ b/include/asm-x86/mach-xen/asm/dma-mapping_64.h
- +++ linux-2.6.25-xen/include/asm-x86/mach-xen/asm/dma-mapping_64.h	2008-05-23 20:39:03.000000000 +0200
  @@ -55,13 +55,6 @@
   extern struct dma_mapping_ops* dma_ops;
   extern int iommu_merge;
-Line 10320 
 diff -Naur linux-2.6.25/include/asm-x86/
+Line 10337 
 diff -Naur linux-2.6.25/include/asm-x86/
   #if 0
   static inline int dma_mapping_error(dma_addr_t dma_addr)
   {
- diff -Naur linux-2.6.25/include/asm-x86/mach-xen/asm/e820_64.h linux-2.6.25-xen/include/asm-x86/mach-xen/asm/e820_64.h
+ --- a/include/asm-x86/mach-xen/asm/e820_64.h
- --- linux-2.6.25/include/asm-x86/mach-xen/asm/e820_64.h	2008-05-23 20:51:11.000000000 +0200
+ +++ b/include/asm-x86/mach-xen/asm/e820_64.h
- +++ linux-2.6.25-xen/include/asm-x86/mach-xen/asm/e820_64.h	2008-05-23 20:39:03.000000000 +0200
  @@ -19,13 +19,9 @@
   #define E820_RAM	1
-Line 10360 
 diff -Naur linux-2.6.25/include/asm-x86/
+Line 10376 
 diff -Naur linux-2.6.25/include/asm-x86/
   extern struct e820map e820;
- diff -Naur linux-2.6.25/include/asm-x86/mach-xen/asm/fixmap_32.h linux-2.6.25-xen/include/asm-x86/mach-xen/asm/fixmap_32.h
+ --- a/include/asm-x86/mach-xen/asm/fixmap_32.h
- --- linux-2.6.25/include/asm-x86/mach-xen/asm/fixmap_32.h	2008-05-23 20:51:11.000000000 +0200
+ +++ b/include/asm-x86/mach-xen/asm/fixmap_32.h
- +++ linux-2.6.25-xen/include/asm-x86/mach-xen/asm/fixmap_32.h	2008-05-23 20:39:03.000000000 +0200
  @@ -55,7 +55,7 @@
   #ifdef CONFIG_X86_LOCAL_APIC
   	FIX_APIC_BASE,	/* local (CPU) APIC) -- required for SMP or not */
-Line 10384 
 diff -Naur linux-2.6.25/include/asm-x86/
+Line 10399 
 diff -Naur linux-2.6.25/include/asm-x86/
   #define set_fixmap(idx, phys) \
   		__set_fixmap(idx, phys, PAGE_KERNEL)
- diff -Naur linux-2.6.25/include/asm-x86/mach-xen/asm/fixmap_64.h linux-2.6.25-xen/include/asm-x86/mach-xen/asm/fixmap_64.h
+ --- a/include/asm-x86/mach-xen/asm/fixmap_64.h
- --- linux-2.6.25/include/asm-x86/mach-xen/asm/fixmap_64.h	2008-05-23 20:51:11.000000000 +0200
+ +++ b/include/asm-x86/mach-xen/asm/fixmap_64.h
- +++ linux-2.6.25-xen/include/asm-x86/mach-xen/asm/fixmap_64.h	2008-05-23 20:39:03.000000000 +0200
  @@ -41,7 +41,7 @@
   #ifdef CONFIG_X86_LOCAL_APIC
   	FIX_APIC_BASE,	/* local (CPU) APIC) -- required for SMP or not */
-Line 10396 
 diff -Naur linux-2.6.25/include/asm-x86/
+Line 10410 
 diff -Naur linux-2.6.25/include/asm-x86/
   	FIX_IO_APIC_BASE_0,
   	FIX_IO_APIC_BASE_END = FIX_IO_APIC_BASE_0 + MAX_IO_APICS-1,
   #endif
- diff -Naur linux-2.6.25/include/asm-x86/mach-xen/asm/hw_irq_32.h linux-2.6.25-xen/include/asm-x86/mach-xen/asm/hw_irq_32.h
+ --- a/include/asm-x86/mach-xen/asm/hw_irq_32.h
- --- linux-2.6.25/include/asm-x86/mach-xen/asm/hw_irq_32.h	2008-05-23 20:51:11.000000000 +0200
+ +++ b/include/asm-x86/mach-xen/asm/hw_irq_32.h
- +++ linux-2.6.25-xen/include/asm-x86/mach-xen/asm/hw_irq_32.h	2008-05-23 20:39:03.000000000 +0200
  @@ -17,8 +17,6 @@
   #include <asm/irq.h>
   #include <asm/sections.h>
-Line 10428 
 diff -Naur linux-2.6.25/include/asm-x86/
+Line 10441 
 diff -Naur linux-2.6.25/include/asm-x86/
   #define platform_legacy_irq(irq)	((irq) < 16)
   #endif
- diff -Naur linux-2.6.25/include/asm-x86/mach-xen/asm/hw_irq_64.h linux-2.6.25-xen/include/asm-x86/mach-xen/asm/hw_irq_64.h
+ --- a/include/asm-x86/mach-xen/asm/hw_irq_64.h
- --- linux-2.6.25/include/asm-x86/mach-xen/asm/hw_irq_64.h	2008-05-23 20:51:11.000000000 +0200
+ +++ b/include/asm-x86/mach-xen/asm/hw_irq_64.h
- +++ linux-2.6.25-xen/include/asm-x86/mach-xen/asm/hw_irq_64.h	2008-05-23 20:39:03.000000000 +0200
  @@ -19,8 +19,7 @@
   #include <asm/irq.h>
   #include <linux/profile.h>
-Line 10455 
 diff -Naur linux-2.6.25/include/asm-x86/
+Line 10467 
 diff -Naur linux-2.6.25/include/asm-x86/
   /*
    * Various low-level irq details needed by irq.c, process.c,
- diff -Naur linux-2.6.25/include/asm-x86/mach-xen/asm/io_32.h linux-2.6.25-xen/include/asm-x86/mach-xen/asm/io_32.h
+ --- a/include/asm-x86/mach-xen/asm/io_32.h
- --- linux-2.6.25/include/asm-x86/mach-xen/asm/io_32.h	2008-05-23 20:51:11.000000000 +0200
+ +++ b/include/asm-x86/mach-xen/asm/io_32.h
- +++ linux-2.6.25-xen/include/asm-x86/mach-xen/asm/io_32.h	2008-05-23 20:39:03.000000000 +0200
  @@ -237,33 +237,6 @@
   #define eth_io_copy_and_sum(a,b,c,d)		eth_copy_and_sum((a),(void __force *)(b),(c),(d))
-Line 10492 
 diff -Naur linux-2.6.25/include/asm-x86/
+Line 10503 
 diff -Naur linux-2.6.25/include/asm-x86/
   /*
    *	Cache management
    *
- diff -Naur linux-2.6.25/include/asm-x86/mach-xen/asm/io_64.h linux-2.6.25-xen/include/asm-x86/mach-xen/asm/io_64.h
+ --- a/include/asm-x86/mach-xen/asm/io_64.h
- --- linux-2.6.25/include/asm-x86/mach-xen/asm/io_64.h	2008-05-23 20:51:11.000000000 +0200
+ +++ b/include/asm-x86/mach-xen/asm/io_64.h
- +++ linux-2.6.25-xen/include/asm-x86/mach-xen/asm/io_64.h	2008-05-23 20:39:03.000000000 +0200
  @@ -273,33 +273,6 @@
   #define eth_io_copy_and_sum(a,b,c,d)		eth_copy_and_sum((a),(void *)(b),(c),(d))
-Line 10529 
 diff -Naur linux-2.6.25/include/asm-x86/
+Line 10539 
 diff -Naur linux-2.6.25/include/asm-x86/
   /* Nothing to do */
   #define dma_cache_inv(_start,_size)		do { } while (0)
- diff -Naur linux-2.6.25/include/asm-x86/mach-xen/asm/pgtable-2level.h linux-2.6.25-xen/include/asm-x86/mach-xen/asm/pgtable-2level.h
+ --- a/include/asm-x86/mach-xen/asm/pgtable-2level.h
- --- linux-2.6.25/include/asm-x86/mach-xen/asm/pgtable-2level.h	2008-05-23 20:51:11.000000000 +0200
+ +++ b/include/asm-x86/mach-xen/asm/pgtable-2level.h
- +++ linux-2.6.25-xen/include/asm-x86/mach-xen/asm/pgtable-2level.h	2008-05-23 20:39:03.000000000 +0200
  @@ -23,14 +23,6 @@
   		set_pte((ptep), (pteval));				\
   } while (0)
-Line 10572 
 diff -Naur linux-2.6.25/include/asm-x86/
+Line 10581 
 diff -Naur linux-2.6.25/include/asm-x86/
   #define __pte_mfn(_pte) ((_pte).pte_low >> PAGE_SHIFT)
   #define pte_mfn(_pte) ((_pte).pte_low & _PAGE_PRESENT ? \
   	__pte_mfn(_pte) : pfn_to_mfn(__pte_mfn(_pte)))
- diff -Naur linux-2.6.25/include/asm-x86/mach-xen/asm/pgtable_32.h linux-2.6.25-xen/include/asm-x86/mach-xen/asm/pgtable_32.h
+ --- a/include/asm-x86/mach-xen/asm/pgtable-3level.h
- --- linux-2.6.25/include/asm-x86/mach-xen/asm/pgtable_32.h	2008-05-23 20:51:11.000000000 +0200
+ +++ b/include/asm-x86/mach-xen/asm/pgtable-3level.h
- +++ linux-2.6.25-xen/include/asm-x86/mach-xen/asm/pgtable_32.h	2008-05-23 20:39:03.000000000 +0200
+ @@ -53,7 +53,6 @@
+   * not possible, use pte_get_and_clear to obtain the old pte
+   * value and then use set_pte to update it.  -ben
+   */
+ -#define __HAVE_ARCH_SET_PTE_ATOMIC
+  static inline void set_pte(pte_t *ptep, pte_t pte)
+  {
+ @@ -70,14 +69,6 @@
+  		set_pte((ptep), (pteval));				\
+  } while (0)
+ -#define set_pte_at_sync(_mm,addr,ptep,pteval) do {			\
+ -	if (((_mm) != current->mm && (_mm) != &init_mm) ||		\
+ -	    HYPERVISOR_update_va_mapping((addr), (pteval), UVMF_INVLPG)) { \
+ -		set_pte((ptep), (pteval));				\
+ -		xen_invlpg((addr));					\
+ -	}								\
+ -} while (0)
+ -
+  #define set_pmd(pmdptr,pmdval)				\
+  		xen_l2_entry_update((pmdptr), (pmdval))
+  #define set_pud(pudptr,pudval) \
+ @@ -94,7 +85,7 @@
+  #define pud_page(pud) \
+  ((struct page *) __va(pud_val(pud) & PAGE_MASK))
+ -#define pud_page_kernel(pud) \
+ +#define pud_page_vaddr(pud) \
+  ((unsigned long) __va(pud_val(pud) & PAGE_MASK))
+ @@ -124,6 +115,7 @@
+  #define pmd_clear(xp)	do { set_pmd(xp, __pmd(0)); } while (0)
+ +#define __HAVE_ARCH_PTEP_GET_AND_CLEAR
+  static inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
+  {
+  	pte_t pte = *ptep;
+ @@ -142,6 +134,7 @@
+  	return pte;
+  }
+ +#define __HAVE_ARCH_PTEP_CLEAR_FLUSH
+  #define ptep_clear_flush(vma, addr, ptep)			\
+  ({								\
+  	pte_t *__ptep = (ptep);					\
+ @@ -159,6 +152,7 @@
+  	__res;							\
+  })
+ +#define __HAVE_ARCH_PTE_SAME
+  static inline int pte_same(pte_t a, pte_t b)
+  {
+  	return a.pte_low == b.pte_low && a.pte_high == b.pte_high;
+ --- a/include/asm-x86/mach-xen/asm/pgtable_32.h
+ +++ b/include/asm-x86/mach-xen/asm/pgtable_32.h
  @@ -260,31 +260,89 @@
   # include <asm/pgtable-2level.h>
   #endif
-Line 10785 
 diff -Naur linux-2.6.25/include/asm-x86/
+Line 10851 
 diff -Naur linux-2.6.25/include/asm-x86/
   #include <asm-generic/pgtable.h>
   #endif /* _I386_PGTABLE_H */
- diff -Naur linux-2.6.25/include/asm-x86/mach-xen/asm/pgtable-3level.h linux-2.6.25-xen/include/asm-x86/mach-xen/asm/pgtable-3level.h
+ --- a/include/asm-x86/mach-xen/asm/pgtable_64.h
- --- linux-2.6.25/include/asm-x86/mach-xen/asm/pgtable-3level.h	2008-05-23 20:51:11.000000000 +0200
+ +++ b/include/asm-x86/mach-xen/asm/pgtable_64.h
- +++ linux-2.6.25-xen/include/asm-x86/mach-xen/asm/pgtable-3level.h	2008-05-23 20:39:03.000000000 +0200
- @@ -53,7 +53,6 @@
-   * not possible, use pte_get_and_clear to obtain the old pte
-   * value and then use set_pte to update it.  -ben
-   */
- -#define __HAVE_ARCH_SET_PTE_ATOMIC
-  static inline void set_pte(pte_t *ptep, pte_t pte)
-  {
- @@ -70,14 +69,6 @@
-  		set_pte((ptep), (pteval));				\
-  } while (0)
- -#define set_pte_at_sync(_mm,addr,ptep,pteval) do {			\
- -	if (((_mm) != current->mm && (_mm) != &init_mm) ||		\
- -	    HYPERVISOR_update_va_mapping((addr), (pteval), UVMF_INVLPG)) { \
- -		set_pte((ptep), (pteval));				\
- -		xen_invlpg((addr));					\
- -	}								\
- -} while (0)
- -
-  #define set_pmd(pmdptr,pmdval)				\
-  		xen_l2_entry_update((pmdptr), (pmdval))
-  #define set_pud(pudptr,pudval) \
- @@ -94,7 +85,7 @@
-  #define pud_page(pud) \
-  ((struct page *) __va(pud_val(pud) & PAGE_MASK))
- -#define pud_page_kernel(pud) \
- +#define pud_page_vaddr(pud) \
-  ((unsigned long) __va(pud_val(pud) & PAGE_MASK))
- @@ -124,6 +115,7 @@
-  #define pmd_clear(xp)	do { set_pmd(xp, __pmd(0)); } while (0)
- +#define __HAVE_ARCH_PTEP_GET_AND_CLEAR
-  static inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
-  {
-  	pte_t pte = *ptep;
- @@ -142,6 +134,7 @@
-  	return pte;
-  }
- +#define __HAVE_ARCH_PTEP_CLEAR_FLUSH
-  #define ptep_clear_flush(vma, addr, ptep)			\
-  ({								\
-  	pte_t *__ptep = (ptep);					\
- @@ -159,6 +152,7 @@
-  	__res;							\
-  })
- +#define __HAVE_ARCH_PTE_SAME
-  static inline int pte_same(pte_t a, pte_t b)
-  {
-  	return a.pte_low == b.pte_low && a.pte_high == b.pte_high;
- diff -Naur linux-2.6.25/include/asm-x86/mach-xen/asm/pgtable_64.h linux-2.6.25-xen/include/asm-x86/mach-xen/asm/pgtable_64.h
- --- linux-2.6.25/include/asm-x86/mach-xen/asm/pgtable_64.h	2008-05-23 20:51:11.000000000 +0200
- +++ linux-2.6.25-xen/include/asm-x86/mach-xen/asm/pgtable_64.h	2008-05-23 20:39:03.000000000 +0200
  @@ -43,12 +43,9 @@
   #define swapper_pg_dir init_level4_pgt
-Line 11025 
 diff -Naur linux-2.6.25/include/asm-x86/
+Line 11031 
 diff -Naur linux-2.6.25/include/asm-x86/
   #define __HAVE_ARCH_PTEP_GET_AND_CLEAR
   #define __HAVE_ARCH_PTEP_GET_AND_CLEAR_FULL
   #define __HAVE_ARCH_PTEP_CLEAR_FLUSH
- diff -Naur linux-2.6.25/include/asm-x86/mach-xen/asm/processor_32.h linux-2.6.25-xen/include/asm-x86/mach-xen/asm/processor_32.h
+ --- a/include/asm-x86/mach-xen/asm/processor_32.h
- --- linux-2.6.25/include/asm-x86/mach-xen/asm/processor_32.h	2008-05-23 20:51:22.000000000 +0200
+ +++ b/include/asm-x86/mach-xen/asm/processor_32.h
- +++ linux-2.6.25-xen/include/asm-x86/mach-xen/asm/processor_32.h	2008-05-23 20:39:03.000000000 +0200
  @@ -146,6 +146,18 @@
   #define X86_EFLAGS_VIP	0x00100000 /* Virtual Interrupt Pending */
   #define X86_EFLAGS_ID	0x00200000 /* CPUID detection flag */
-Line 11139 
 diff -Naur linux-2.6.25/include/asm-x86/
+Line 11144 
 diff -Naur linux-2.6.25/include/asm-x86/
   /* from system description table in BIOS.  Mostly for MCA use, but
   others may find it useful. */
   extern unsigned int machine_id;
- diff -Naur linux-2.6.25/include/asm-x86/mach-xen/asm/processor_64.h linux-2.6.25-xen/include/asm-x86/mach-xen/asm/processor_64.h
+ --- a/include/asm-x86/mach-xen/asm/processor_64.h
- --- linux-2.6.25/include/asm-x86/mach-xen/asm/processor_64.h	2008-05-23 20:51:11.000000000 +0200
+ +++ b/include/asm-x86/mach-xen/asm/processor_64.h
- +++ linux-2.6.25-xen/include/asm-x86/mach-xen/asm/processor_64.h	2008-05-23 20:39:03.000000000 +0200
  @@ -484,6 +484,8 @@
   		: :"a" (eax), "c" (ecx));
   }
-Line 11151 
 diff -Naur linux-2.6.25/include/asm-x86/
+Line 11155 
 diff -Naur linux-2.6.25/include/asm-x86/
   #define stack_current() \
   ({								\
   	struct thread_info *ti;					\
- diff -Naur linux-2.6.25/include/asm-x86/mach-xen/asm/segment_32.h linux-2.6.25-xen/include/asm-x86/mach-xen/asm/segment_32.h
+ --- a/include/asm-x86/mach-xen/asm/segment_32.h
- --- linux-2.6.25/include/asm-x86/mach-xen/asm/segment_32.h	2008-05-23 20:51:11.000000000 +0200
+ +++ b/include/asm-x86/mach-xen/asm/segment_32.h
- +++ linux-2.6.25-xen/include/asm-x86/mach-xen/asm/segment_32.h	2008-05-23 20:39:03.000000000 +0200
  @@ -61,11 +61,9 @@
   #define GDT_ENTRY_KERNEL_CS		(GDT_ENTRY_KERNEL_BASE + 0)
-Line 11195 
 diff -Naur linux-2.6.25/include/asm-x86/
+Line 11198 
 diff -Naur linux-2.6.25/include/asm-x86/
  +
  +#define get_kernel_rpl()  (xen_feature(XENFEAT_supervisor_mode_kernel)?0:1)
   #endif
- diff -Naur linux-2.6.25/include/asm-x86/mach-xen/asm/smp_32.h linux-2.6.25-xen/include/asm-x86/mach-xen/asm/smp_32.h
+ --- a/include/asm-x86/mach-xen/asm/smp_32.h
- --- linux-2.6.25/include/asm-x86/mach-xen/asm/smp_32.h	2008-05-23 20:51:11.000000000 +0200
+ +++ b/include/asm-x86/mach-xen/asm/smp_32.h
- +++ linux-2.6.25-xen/include/asm-x86/mach-xen/asm/smp_32.h	2008-05-23 20:39:03.000000000 +0200
  @@ -79,25 +79,36 @@
   	return GET_APIC_ID(*(unsigned long *)(APIC_BASE+APIC_ID));
   }
-Line 11242 
 diff -Naur linux-2.6.25/include/asm-x86/
+Line 11244 
 diff -Naur linux-2.6.25/include/asm-x86/
  +#endif
  +
   #endif
- diff -Naur linux-2.6.25/include/asm-x86/mach-xen/asm/smp_64.h linux-2.6.25-xen/include/asm-x86/mach-xen/asm/smp_64.h
+ --- a/include/asm-x86/mach-xen/asm/smp_64.h
- --- linux-2.6.25/include/asm-x86/mach-xen/asm/smp_64.h	2008-05-23 20:51:11.000000000 +0200
+ +++ b/include/asm-x86/mach-xen/asm/smp_64.h
- +++ linux-2.6.25-xen/include/asm-x86/mach-xen/asm/smp_64.h	2008-05-23 20:39:03.000000000 +0200
  @@ -4,15 +4,12 @@
   /*
    * We need the APIC definitions automatically as part of 'smp.h'
-Line 11350 
 diff -Naur linux-2.6.25/include/asm-x86/
+Line 11351 
 diff -Naur linux-2.6.25/include/asm-x86/
  +#endif /* !CONFIG_SMP */
   #endif
- diff -Naur linux-2.6.25/include/asm-x86/mach-xen/asm/system_32.h linux-2.6.25-xen/include/asm-x86/mach-xen/asm/system_32.h
+ --- a/include/asm-x86/mach-xen/asm/system_32.h
- --- linux-2.6.25/include/asm-x86/mach-xen/asm/system_32.h	2008-05-23 20:51:11.000000000 +0200
+ +++ b/include/asm-x86/mach-xen/asm/system_32.h
- +++ linux-2.6.25-xen/include/asm-x86/mach-xen/asm/system_32.h	2008-05-23 20:39:03.000000000 +0200
  @@ -267,6 +267,9 @@
   #define cmpxchg(ptr,o,n)\
   	((__typeof__(*(ptr)))__cmpxchg((ptr),(unsigned long)(o),\
 Line 11363 
 diff -Naur linux-2.6.25/include/asm-x86/
   #endif
   static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old,
- @@ -296,6 +299,39 @@
+ @@ -291,6 +294,39 @@
-  	return old;
+  				     : "=a"(prev)
-  }
+  				     : "r"(new), "m"(*__xg(ptr)), "0"(old)
+  				     : "memory");
+ +		return prev;
+ +	}
+ +	return old;
+ +}
+ +
  +/*
  + * Always use locked operations when touching memory shared with a
  + * hypervisor, since the system may be SMP even if the guest kernel
-Line 11395 
 diff -Naur linux-2.6.25/include/asm-x86/
+Line 11400 
 diff -Naur linux-2.6.25/include/asm-x86/
  +				     : "=a"(prev)
  +				     : "r"(new), "m"(*__xg(ptr)), "0"(old)
  +				     : "memory");
- +		return prev;
+  		return prev;
- +	}
+  	}
- +	return old;
+  	return old;
- +}
+ --- a/include/asm-x86/mach-xen/asm/system_64.h
- +
+ +++ b/include/asm-x86/mach-xen/asm/system_64.h
-  #ifndef CONFIG_X86_CMPXCHG
-  /*
-   * Building a kernel capable running on 80386. It may be necessary to
- diff -Naur linux-2.6.25/include/asm-x86/mach-xen/asm/system_64.h linux-2.6.25-xen/include/asm-x86/mach-xen/asm/system_64.h
- --- linux-2.6.25/include/asm-x86/mach-xen/asm/system_64.h	2008-05-23 20:51:11.000000000 +0200
- +++ linux-2.6.25-xen/include/asm-x86/mach-xen/asm/system_64.h	2008-05-23 20:39:03.000000000 +0200
  @@ -24,6 +24,7 @@
   #define __EXTRA_CLOBBER  \
   	,"rcx","rbx","rdx","r8","r9","r10","r11","r12","r13","r14","r15"
-Line 11414 
 diff -Naur linux-2.6.25/include/asm-x86/
+Line 11413 
 diff -Naur linux-2.6.25/include/asm-x86/
   #define switch_to(prev,next,last) \
   	asm volatile(SAVE_CONTEXT						    \
   		     "movq %%rsp,%P[threadrsp](%[prev])\n\t" /* save RSP */	  \
- diff -Naur linux-2.6.25/include/asm-x86/mach-xen/asm/tlbflush_32.h linux-2.6.25-xen/include/asm-x86/mach-xen/asm/tlbflush_32.h
+ --- a/include/asm-x86/mach-xen/asm/tlbflush_32.h
- --- linux-2.6.25/include/asm-x86/mach-xen/asm/tlbflush_32.h	2008-05-23 20:51:11.000000000 +0200
+ +++ b/include/asm-x86/mach-xen/asm/tlbflush_32.h
- +++ linux-2.6.25-xen/include/asm-x86/mach-xen/asm/tlbflush_32.h	2008-05-23 20:39:03.000000000 +0200
  @@ -8,8 +8,6 @@
   #define __flush_tlb_global() xen_tlb_flush()
   #define __flush_tlb_all() xen_tlb_flush()
-Line 11426 
 diff -Naur linux-2.6.25/include/asm-x86/
+Line 11424 
 diff -Naur linux-2.6.25/include/asm-x86/
   #define cpu_has_invlpg	(boot_cpu_data.x86 > 3)
   #define __flush_tlb_single(addr) xen_invlpg(addr)
- diff -Naur linux-2.6.25/include/asm-x86/mach-xen/asm/tlbflush_64.h linux-2.6.25-xen/include/asm-x86/mach-xen/asm/tlbflush_64.h
+ --- a/include/asm-x86/mach-xen/asm/tlbflush_64.h
- --- linux-2.6.25/include/asm-x86/mach-xen/asm/tlbflush_64.h	2008-05-23 20:51:11.000000000 +0200
+ +++ b/include/asm-x86/mach-xen/asm/tlbflush_64.h
- +++ linux-2.6.25-xen/include/asm-x86/mach-xen/asm/tlbflush_64.h	2008-05-23 20:39:03.000000000 +0200
  @@ -12,9 +12,6 @@
    */
   #define __flush_tlb_global()	xen_tlb_flush()
-Line 11439 
 diff -Naur linux-2.6.25/include/asm-x86/
+Line 11436 
 diff -Naur linux-2.6.25/include/asm-x86/
   #define __flush_tlb_all() __flush_tlb_global()
   #define __flush_tlb_one(addr)	xen_invlpg((unsigned long)addr)
- diff -Naur linux-2.6.25/include/asm-x86/thread_info_64.h linux-2.6.25-xen/include/asm-x86/thread_info_64.h
+ --- a/include/asm-x86/thread_info_64.h
- --- linux-2.6.25/include/asm-x86/thread_info_64.h	2008-04-17 04:49:44.000000000 +0200
+ +++ b/include/asm-x86/thread_info_64.h
- +++ linux-2.6.25-xen/include/asm-x86/thread_info_64.h	2008-05-23 20:39:03.000000000 +0200
  @@ -157,10 +157,14 @@
   	(_TIF_SIGPENDING|_TIF_SINGLESTEP|_TIF_MCE_NOTIFY|_TIF_HRTICK_RESCHED)
-Line 11457 
 diff -Naur linux-2.6.25/include/asm-x86/
+Line 11453 
 diff -Naur linux-2.6.25/include/asm-x86/
   #define PREEMPT_ACTIVE     0x10000000
- diff -Naur linux-2.6.25/include/linux/skbuff.h linux-2.6.25-xen/include/linux/skbuff.h
+ --- a/include/linux/skbuff.h
- --- linux-2.6.25/include/linux/skbuff.h	2008-05-23 20:51:15.000000000 +0200
+ +++ b/include/linux/skbuff.h
- +++ linux-2.6.25-xen/include/linux/skbuff.h	2008-05-23 20:39:03.000000000 +0200
  @@ -1821,5 +1821,12 @@
   }
-Line 11473 
 diff -Naur linux-2.6.25/include/linux/sk
+Line 11468 
 diff -Naur linux-2.6.25/include/linux/sk
  +
   #endif	/* __KERNEL__ */
   #endif	/* _LINUX_SKBUFF_H */
- diff -Naur linux-2.6.25/include/xen/evtchn.h linux-2.6.25-xen/include/xen/evtchn.h
+ --- a/include/xen/evtchn.h
- --- linux-2.6.25/include/xen/evtchn.h	2008-05-23 20:51:11.000000000 +0200
+ +++ b/include/xen/evtchn.h
- +++ linux-2.6.25-xen/include/xen/evtchn.h	2008-05-23 20:39:03.000000000 +0200
  @@ -54,34 +54,34 @@
    */
   int bind_caller_port_to_irqhandler(
-Line 11516 
 diff -Naur linux-2.6.25/include/xen/evtc
+Line 11510 
 diff -Naur linux-2.6.25/include/xen/evtc
   	unsigned long irqflags,
   	const char *devname,
   	void *dev_id);
- diff -Naur linux-2.6.25/include/xen/xencons.h linux-2.6.25-xen/include/xen/xencons.h
+ --- a/include/xen/xencons.h
- --- linux-2.6.25/include/xen/xencons.h	2008-05-23 20:51:11.000000000 +0200
+ +++ b/include/xen/xencons.h
- +++ linux-2.6.25-xen/include/xen/xencons.h	2008-05-23 20:39:03.000000000 +0200
  @@ -8,7 +8,7 @@
   void xencons_resume(void);
-Line 11528 
 diff -Naur linux-2.6.25/include/xen/xenc
+Line 11521 
 diff -Naur linux-2.6.25/include/xen/xenc
   void xencons_tx(void);
   int xencons_ring_init(void);
- diff -Naur linux-2.6.25/mm/mprotect.c linux-2.6.25-xen/mm/mprotect.c
+ --- a/mm/mprotect.c
- --- linux-2.6.25/mm/mprotect.c	2008-05-23 20:51:15.000000000 +0200
+ +++ b/mm/mprotect.c
- +++ linux-2.6.25-xen/mm/mprotect.c	2008-05-23 20:39:03.000000000 +0200
  @@ -86,7 +86,7 @@
   		next = pmd_addr_end(addr, end);
   		if (pmd_none_or_clear_bad(pmd))
-Line 11540 
 diff -Naur linux-2.6.25/mm/mprotect.c li
+Line 11532 
 diff -Naur linux-2.6.25/mm/mprotect.c li
   			continue;
   		change_pte_range(mm, pmd, addr, next, newprot, dirty_accountable);
   	} while (pmd++, addr = next, addr != end);
- diff -Naur linux-2.6.25/net/core/dev.c linux-2.6.25-xen/net/core/dev.c
+ --- a/net/core/dev.c
- --- linux-2.6.25/net/core/dev.c	2008-05-23 20:51:15.000000000 +0200
+ +++ b/net/core/dev.c
- +++ linux-2.6.25-xen/net/core/dev.c	2008-05-23 20:39:03.000000000 +0200
+ @@ -1611,15 +1611,14 @@
- @@ -1607,15 +1607,14 @@
   		}
   		if ((skb->h.raw + skb->csum + 2) > skb->tail)
   			goto out;
-Line 11561 
 diff -Naur linux-2.6.25/net/core/dev.c l
+Line 11552 
 diff -Naur linux-2.6.25/net/core/dev.c l
   #endif
   /**
- @@ -2111,7 +2110,7 @@
+ @@ -2115,7 +2114,7 @@
   	case CHECKSUM_UNNECESSARY:
   		skb->proto_data_valid = 1;
   		break;
-Line 11570 
 diff -Naur linux-2.6.25/net/core/dev.c l
+Line 11561 
 diff -Naur linux-2.6.25/net/core/dev.c l
   		/* XXX Implement me. */
   	default:
   		skb->proto_data_valid = 0;
- @@ -4644,7 +4643,6 @@
+ @@ -4648,7 +4647,6 @@
   EXPORT_SYMBOL(net_enable_timestamp);
   EXPORT_SYMBOL(net_disable_timestamp);
   EXPORT_SYMBOL(dev_get_flags);

 Legend:



Removed from v.611
 


changed lines


 
Added in v.612
 Legend:



Removed from v.611
 


changed lines


 
Added in v.612
-Removed from v.611
+Added in v.612