]> git.ipfire.org Git - ipfire-2.x.git/blobdiff - src/patches/suse-2.6.27.31/patches.xen/xen3-patch-2.6.20
projects / ipfire-2.x.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add a patch to fix Intel E100 wake-on-lan problems.
[ipfire-2.x.git] / src / patches / suse-2.6.27.31 / patches.xen / xen3-patch-2.6.20
diff --git a/src/patches/suse-2.6.27.31/patches.xen/xen3-patch-2.6.20 b/src/patches/suse-2.6.27.31/patches.xen/xen3-patch-2.6.20
index efc3d6b74c81494deadda29a0c82486e6abba798..88c02c9f09ea9a171734ab7823f78c0c7d538256 100644 (file)
--- a/src/patches/suse-2.6.27.31/patches.xen/xen3-patch-2.6.20
+++ b/src/patches/suse-2.6.27.31/patches.xen/xen3-patch-2.6.20
@@ -6,8 +6,8 @@ Automatically created from "patches.kernel.org/patch-2.6.20" by xen-port-patches
 
 Acked-by: jbeulich@novell.com
 
---- sle11-2009-05-14.orig/arch/x86/Kconfig     2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/Kconfig  2009-02-05 10:22:19.000000000 +0100
+--- sle11-2009-06-29.orig/arch/x86/Kconfig     2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/arch/x86/Kconfig  2009-02-05 10:22:19.000000000 +0100
 @@ -1431,7 +1431,7 @@ config PHYSICAL_START
  
  config RELOCATABLE
@@ -17,8 +17,8 @@ Acked-by: jbeulich@novell.com
        help
          This builds a kernel image that retains relocation information
          so it can be loaded someplace besides the default 1MB.
---- sle11-2009-05-14.orig/arch/x86/kernel/asm-offsets_32.c     2008-11-25 12:35:53.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/asm-offsets_32.c  2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/arch/x86/kernel/asm-offsets_32.c     2008-11-25 12:35:53.000000000 +0100
++++ sle11-2009-06-29/arch/x86/kernel/asm-offsets_32.c  2008-12-15 11:26:44.000000000 +0100
 @@ -54,6 +54,7 @@ void foo(void)
        OFFSET(TI_exec_domain, thread_info, exec_domain);
        OFFSET(TI_flags, thread_info, flags);
@@ -39,8 +39,8 @@ Acked-by: jbeulich@novell.com
  #ifdef CONFIG_PARAVIRT
        BLANK();
        OFFSET(PARAVIRT_enabled, pv_info, paravirt_enabled);
---- sle11-2009-05-14.orig/arch/x86/kernel/cpu/common-xen.c     2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/cpu/common-xen.c  2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/arch/x86/kernel/cpu/common-xen.c     2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/arch/x86/kernel/cpu/common-xen.c  2008-12-15 11:26:44.000000000 +0100
 @@ -22,6 +22,7 @@
  #define phys_pkg_id(a,b) a
  #endif
@@ -438,8 +438,8 @@ Acked-by: jbeulich@novell.com
  #ifdef CONFIG_HOTPLUG_CPU
  void __cpuinit cpu_uninit(void)
  {
---- sle11-2009-05-14.orig/arch/x86/kernel/cpu/mtrr/main-xen.c  2009-05-14 11:02:41.000000000 +0200
-+++ sle11-2009-05-14/arch/x86/kernel/cpu/mtrr/main-xen.c       2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/arch/x86/kernel/cpu/mtrr/main-xen.c  2009-06-29 15:14:52.000000000 +0200
++++ sle11-2009-06-29/arch/x86/kernel/cpu/mtrr/main-xen.c       2008-12-15 11:26:44.000000000 +0100
 @@ -12,7 +12,7 @@
  static DEFINE_MUTEX(mtrr_mutex);
  
@@ -460,7 +460,7 @@ Acked-by: jbeulich@novell.com
        struct xen_platform_op op;
  
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ sle11-2009-05-14/arch/x86/kernel/e820_32-xen.c     2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-06-29/arch/x86/kernel/e820_32-xen.c     2008-12-15 11:26:44.000000000 +0100
 @@ -0,0 +1,1015 @@
 +#include <linux/kernel.h>
 +#include <linux/types.h>
@@ -1477,8 +1477,8 @@ Acked-by: jbeulich@novell.com
 +      return 0;
 +}
 +early_param("memmap", parse_memmap);
---- sle11-2009-05-14.orig/arch/x86/kernel/entry_32-xen.S       2009-05-14 11:07:47.000000000 +0200
-+++ sle11-2009-05-14/arch/x86/kernel/entry_32-xen.S    2009-05-14 11:08:06.000000000 +0200
+--- sle11-2009-06-29.orig/arch/x86/kernel/entry_32-xen.S       2009-05-14 11:07:47.000000000 +0200
++++ sle11-2009-06-29/arch/x86/kernel/entry_32-xen.S    2009-05-14 11:08:06.000000000 +0200
 @@ -30,12 +30,13 @@
   *    18(%esp) - %eax
   *    1C(%esp) - %ds
@@ -2249,8 +2249,8 @@ Acked-by: jbeulich@novell.com
  ENTRY(fixup_4gb_segment)
        RING0_EC_FRAME
        pushl $do_fixup_4gb_segment
---- sle11-2009-05-14.orig/arch/x86/kernel/head_32-xen.S        2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/head_32-xen.S     2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/arch/x86/kernel/head_32-xen.S        2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/arch/x86/kernel/head_32-xen.S     2008-12-15 11:26:44.000000000 +0100
 @@ -9,6 +9,7 @@
  #include <asm/cache.h>
  #include <asm/thread_info.h>
@@ -2367,8 +2367,8 @@ Acked-by: jbeulich@novell.com
        .ascii  ",FEATURES=writable_page_tables"
        .ascii           "|writable_descriptor_tables"
        .ascii           "|auto_translated_physmap"
---- sle11-2009-05-14.orig/arch/x86/kernel/io_apic_32-xen.c     2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/io_apic_32-xen.c  2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/arch/x86/kernel/io_apic_32-xen.c     2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/arch/x86/kernel/io_apic_32-xen.c  2008-12-15 11:26:44.000000000 +0100
 @@ -34,6 +34,7 @@
  #include <linux/pci.h>
  #include <linux/msi.h>
@@ -2561,8 +2561,8 @@ Acked-by: jbeulich@novell.com
        set_native_irq_info(irq, TARGET_CPUS);
        spin_unlock_irqrestore(&ioapic_lock, flags);
  
---- sle11-2009-05-14.orig/arch/x86/kernel/ldt_32-xen.c 2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/ldt_32-xen.c      2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/arch/x86/kernel/ldt_32-xen.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/arch/x86/kernel/ldt_32-xen.c      2008-12-15 11:26:44.000000000 +0100
 @@ -177,16 +177,14 @@ static int read_default_ldt(void __user 
  {
        int err;
@@ -2581,8 +2581,8 @@ Acked-by: jbeulich@novell.com
                err = -EFAULT;
  
        return err;
---- sle11-2009-05-14.orig/arch/x86/kernel/microcode-xen.c      2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/microcode-xen.c   2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/arch/x86/kernel/microcode-xen.c      2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/arch/x86/kernel/microcode-xen.c   2008-12-15 11:26:44.000000000 +0100
 @@ -1,7 +1,7 @@
  /*
   *    Intel CPU Microcode Update Driver for Linux
@@ -2610,8 +2610,8 @@ Acked-by: jbeulich@novell.com
        return 0;
  }
  
---- sle11-2009-05-14.orig/arch/x86/kernel/mpparse_32-xen.c     2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/mpparse_32-xen.c  2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/arch/x86/kernel/mpparse_32-xen.c     2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/arch/x86/kernel/mpparse_32-xen.c  2008-12-15 11:26:44.000000000 +0100
 @@ -36,7 +36,7 @@
  
  /* Have we found an MP table */
@@ -2661,8 +2661,8 @@ Acked-by: jbeulich@novell.com
  {
        struct mpc_config_processor processor;
        int boot_cpu = 0;
---- sle11-2009-05-14.orig/arch/x86/kernel/pci-dma-xen.c        2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/pci-dma-xen.c     2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/arch/x86/kernel/pci-dma-xen.c        2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/arch/x86/kernel/pci-dma-xen.c     2008-12-15 11:26:44.000000000 +0100
 @@ -276,7 +276,7 @@ EXPORT_SYMBOL(dma_free_coherent);
  int dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr,
                                dma_addr_t device_addr, size_t size, int flags)
@@ -2698,8 +2698,8 @@ Acked-by: jbeulich@novell.com
        return 0;
  }
  EXPORT_SYMBOL(dma_declare_coherent_memory);
---- sle11-2009-05-14.orig/arch/x86/kernel/process_32-xen.c     2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/process_32-xen.c  2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/arch/x86/kernel/process_32-xen.c     2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/arch/x86/kernel/process_32-xen.c  2008-12-15 11:26:44.000000000 +0100
 @@ -60,6 +60,7 @@
  
  #include <asm/tlbflush.h>
@@ -2824,8 +2824,8 @@ Acked-by: jbeulich@novell.com
        return prev_p;
  }
  
---- sle11-2009-05-14.orig/arch/x86/kernel/quirks-xen.c 2009-05-14 11:02:41.000000000 +0200
-+++ sle11-2009-05-14/arch/x86/kernel/quirks-xen.c      2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/arch/x86/kernel/quirks-xen.c 2009-06-29 15:14:52.000000000 +0200
++++ sle11-2009-06-29/arch/x86/kernel/quirks-xen.c      2008-12-15 11:26:44.000000000 +0100
 @@ -3,10 +3,12 @@
   */
  #include <linux/pci.h>
@@ -2922,8 +2922,8 @@ Acked-by: jbeulich@novell.com
 +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_E7520_MCH,  verify_quirk_intel_irqbalance);
 +
  #endif
---- sle11-2009-05-14.orig/arch/x86/kernel/setup_32-xen.c       2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/setup_32-xen.c    2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/arch/x86/kernel/setup_32-xen.c       2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/arch/x86/kernel/setup_32-xen.c    2008-12-15 11:26:44.000000000 +0100
 @@ -76,9 +76,6 @@
  #include <xen/interface/kexec.h>
  #endif
@@ -4010,8 +4010,8 @@ Acked-by: jbeulich@novell.com
  
        if (is_initial_xendomain()) {
  #ifdef CONFIG_VT
---- sle11-2009-05-14.orig/arch/x86/kernel/smp_32-xen.c 2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/smp_32-xen.c      2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/arch/x86/kernel/smp_32-xen.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/arch/x86/kernel/smp_32-xen.c      2008-12-15 11:26:44.000000000 +0100
 @@ -659,6 +659,10 @@ int smp_call_function_single(int cpu, vo
                put_cpu();
                return -EBUSY;
@@ -4023,8 +4023,8 @@ Acked-by: jbeulich@novell.com
        spin_lock_bh(&call_lock);
        __smp_call_function_single(cpu, func, info, nonatomic, wait);
        spin_unlock_bh(&call_lock);
---- sle11-2009-05-14.orig/arch/x86/kernel/time_32-xen.c        2009-03-24 10:08:00.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/time_32-xen.c     2009-03-24 10:08:30.000000000 +0100
+--- sle11-2009-06-29.orig/arch/x86/kernel/time_32-xen.c        2009-03-24 10:08:00.000000000 +0100
++++ sle11-2009-06-29/arch/x86/kernel/time_32-xen.c     2009-03-24 10:08:30.000000000 +0100
 @@ -61,6 +61,7 @@
  #include <asm/uaccess.h>
  #include <asm/processor.h>
@@ -4080,8 +4080,8 @@ Acked-by: jbeulich@novell.com
  }
  #endif
  
---- sle11-2009-05-14.orig/arch/x86/kernel/traps_32-xen.c       2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/traps_32-xen.c    2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/arch/x86/kernel/traps_32-xen.c       2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/arch/x86/kernel/traps_32-xen.c    2008-12-15 11:26:44.000000000 +0100
 @@ -29,6 +29,8 @@
  #include <linux/kexec.h>
  #include <linux/unwind.h>
@@ -4418,8 +4418,8 @@ Acked-by: jbeulich@novell.com
 -}
 -__setup("call_trace=", call_trace_setup);
 -#endif
---- sle11-2009-05-14.orig/arch/x86/kernel/vmlinux_32.lds.S     2009-05-14 11:02:41.000000000 +0200
-+++ sle11-2009-05-14/arch/x86/kernel/vmlinux_32.lds.S  2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/arch/x86/kernel/vmlinux_32.lds.S     2009-06-29 15:14:52.000000000 +0200
++++ sle11-2009-06-29/arch/x86/kernel/vmlinux_32.lds.S  2008-12-15 11:26:44.000000000 +0100
 @@ -29,6 +29,12 @@ PHDRS {
  SECTIONS
  {
@@ -4433,8 +4433,8 @@ Acked-by: jbeulich@novell.com
    phys_startup_32 = startup_32 - LOAD_OFFSET;
  
    .text.head : AT(ADDR(.text.head) - LOAD_OFFSET) {
---- sle11-2009-05-14.orig/arch/x86/kvm/Kconfig 2009-05-14 11:02:41.000000000 +0200
-+++ sle11-2009-05-14/arch/x86/kvm/Kconfig      2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/arch/x86/kvm/Kconfig 2009-06-29 15:14:52.000000000 +0200
++++ sle11-2009-06-29/arch/x86/kvm/Kconfig      2008-12-15 11:26:44.000000000 +0100
 @@ -7,6 +7,7 @@ config HAVE_KVM
  menuconfig VIRTUALIZATION
        bool "Virtualization"
@@ -4443,8 +4443,8 @@ Acked-by: jbeulich@novell.com
        default y
        ---help---
          Say Y here to get to see options for using your Linux host to run other
---- sle11-2009-05-14.orig/arch/x86/mm/fault_32-xen.c   2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/mm/fault_32-xen.c        2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/arch/x86/mm/fault_32-xen.c   2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/arch/x86/mm/fault_32-xen.c        2008-12-15 11:26:44.000000000 +0100
 @@ -22,9 +22,9 @@
  #include <linux/highmem.h>
  #include <linux/module.h>
@@ -4489,8 +4489,8 @@ Acked-by: jbeulich@novell.com
                                break;
                        prefetch = (instr_lo == 0xF) &&
                                (opcode == 0x0D || opcode == 0x18);
---- sle11-2009-05-14.orig/arch/x86/mm/highmem_32-xen.c 2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/mm/highmem_32-xen.c      2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/arch/x86/mm/highmem_32-xen.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/arch/x86/mm/highmem_32-xen.c      2008-12-15 11:26:44.000000000 +0100
 @@ -32,7 +32,7 @@ static void *__kmap_atomic(struct page *
        unsigned long vaddr;
  
@@ -4545,8 +4545,8 @@ Acked-by: jbeulich@novell.com
  
        idx = type + KM_TYPE_NR*smp_processor_id();
        vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
---- sle11-2009-05-14.orig/arch/x86/mm/init_32-xen.c    2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/mm/init_32-xen.c 2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/arch/x86/mm/init_32-xen.c    2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/arch/x86/mm/init_32-xen.c 2008-12-15 11:26:44.000000000 +0100
 @@ -233,8 +233,6 @@ static inline int page_kills_ppro(unsign
  
  #endif
@@ -4607,8 +4607,8 @@ Acked-by: jbeulich@novell.com
  
  void __init pgtable_cache_init(void)
  {
---- sle11-2009-05-14.orig/arch/x86/mm/pgtable_32-xen.c 2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/mm/pgtable_32-xen.c      2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/arch/x86/mm/pgtable_32-xen.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/arch/x86/mm/pgtable_32-xen.c      2008-12-15 11:26:44.000000000 +0100
 @@ -203,7 +203,7 @@ void pte_free(struct page *pte)
        __free_page(pte);
  }
@@ -4636,8 +4636,8 @@ Acked-by: jbeulich@novell.com
  {
        unsigned long flags; /* can be called from interrupt context */
  
---- sle11-2009-05-14.orig/arch/x86/pci/irq-xen.c       2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/pci/irq-xen.c    2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/arch/x86/pci/irq-xen.c       2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/arch/x86/pci/irq-xen.c    2008-12-15 11:26:44.000000000 +0100
 @@ -768,7 +768,7 @@ static void __init pirq_find_router(stru
        DBG(KERN_DEBUG "PCI: Attempting to find IRQ router for %04x:%04x\n",
            rt->rtr_vendor, rt->rtr_device);
@@ -4656,8 +4656,8 @@ Acked-by: jbeulich@novell.com
  }
  
  static struct irq_info *pirq_get_info(struct pci_dev *dev)
---- sle11-2009-05-14.orig/arch/x86/kernel/entry_64-xen.S       2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/entry_64-xen.S    2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/arch/x86/kernel/entry_64-xen.S       2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/arch/x86/kernel/entry_64-xen.S    2008-12-15 11:26:44.000000000 +0100
 @@ -261,7 +261,6 @@ ENTRY(system_call)
        movq  %rax,ORIG_RAX-ARGOFFSET(%rsp) 
        GET_THREAD_INFO(%rcx)
@@ -4795,8 +4795,8 @@ Acked-by: jbeulich@novell.com
 -      CFI_ENDPROC
 -ENDPROC(arch_unwind_init_running)
 -#endif
---- sle11-2009-05-14.orig/arch/x86/kernel/genapic_64-xen.c     2009-05-14 11:02:41.000000000 +0200
-+++ sle11-2009-05-14/arch/x86/kernel/genapic_64-xen.c  2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/arch/x86/kernel/genapic_64-xen.c     2009-06-29 15:14:52.000000000 +0200
++++ sle11-2009-06-29/arch/x86/kernel/genapic_64-xen.c  2008-12-15 11:26:44.000000000 +0100
 @@ -34,6 +34,7 @@ extern struct genapic apic_physflat;
  
  #ifndef CONFIG_XEN
@@ -4819,8 +4819,8 @@ Acked-by: jbeulich@novell.com
  #if defined(CONFIG_ACPI)
        /*
         * Some x86_64 machines use physical APIC mode regardless of how many
---- sle11-2009-05-14.orig/arch/x86/kernel/head64-xen.c 2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/head64-xen.c      2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/arch/x86/kernel/head64-xen.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/arch/x86/kernel/head64-xen.c      2008-12-15 11:26:44.000000000 +0100
 @@ -104,7 +104,10 @@ void __init x86_64_start_kernel(char * r
                machine_to_phys_order++;
  
@@ -4833,8 +4833,8 @@ Acked-by: jbeulich@novell.com
                set_intr_gate(i, early_idt_handler);
        asm volatile("lidt %0" :: "m" (idt_descr));
  #endif
---- sle11-2009-05-14.orig/arch/x86/kernel/io_apic_64-xen.c     2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/io_apic_64-xen.c  2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/arch/x86/kernel/io_apic_64-xen.c     2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/arch/x86/kernel/io_apic_64-xen.c  2008-12-15 11:26:44.000000000 +0100
 @@ -202,14 +202,20 @@ static struct IO_APIC_route_entry ioapic
   * the interrupt, and we need to make sure the entry is fully populated
   * before that happens.
@@ -5027,8 +5027,8 @@ Acked-by: jbeulich@novell.com
                }
  
        }
---- sle11-2009-05-14.orig/arch/x86/kernel/irq_64-xen.c 2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/irq_64-xen.c      2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/arch/x86/kernel/irq_64-xen.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/arch/x86/kernel/irq_64-xen.c      2008-12-15 11:26:44.000000000 +0100
 @@ -120,7 +120,7 @@ asmlinkage unsigned int do_IRQ(struct pt
  
        if (likely(irq < NR_IRQS))
@@ -5038,8 +5038,8 @@ Acked-by: jbeulich@novell.com
                printk(KERN_EMERG "%s: %d.%d No irq handler for irq\n",
                        __func__, smp_processor_id(), irq);
  
---- sle11-2009-05-14.orig/arch/x86/kernel/mpparse_64-xen.c     2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/mpparse_64-xen.c  2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/arch/x86/kernel/mpparse_64-xen.c     2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/arch/x86/kernel/mpparse_64-xen.c  2008-12-15 11:26:44.000000000 +0100
 @@ -35,8 +35,6 @@
  int smp_found_config;
  unsigned int __initdata maxcpus = NR_CPUS;
@@ -5049,8 +5049,8 @@ Acked-by: jbeulich@novell.com
  /*
   * Various Linux-internal data structures created from the
   * MP-table.
---- sle11-2009-05-14.orig/arch/x86/kernel/process_64-xen.c     2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/process_64-xen.c  2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/arch/x86/kernel/process_64-xen.c     2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/arch/x86/kernel/process_64-xen.c  2008-12-15 11:26:44.000000000 +0100
 @@ -119,29 +119,23 @@ void exit_idle(void)
  static void poll_idle (void)
  {
@@ -5105,8 +5105,8 @@ Acked-by: jbeulich@novell.com
                        enter_idle();
                        idle();
                        /* In many cases the interrupt that ended idle
---- sle11-2009-05-14.orig/arch/x86/kernel/setup_64-xen.c       2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/setup_64-xen.c    2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/arch/x86/kernel/setup_64-xen.c       2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/arch/x86/kernel/setup_64-xen.c    2008-12-15 11:26:44.000000000 +0100
 @@ -573,8 +573,7 @@ void __init setup_arch(char **cmdline_p)
        if (LOADER_TYPE && INITRD_START) {
                if (INITRD_START + INITRD_SIZE <= (end_pfn << PAGE_SHIFT)) {
@@ -5159,8 +5159,8 @@ Acked-by: jbeulich@novell.com
        c->x86_max_cores = intel_num_cpu_cores(c);
  
        srat_detect_node();
---- sle11-2009-05-14.orig/arch/x86/kernel/smp_64-xen.c 2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/smp_64-xen.c      2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/arch/x86/kernel/smp_64-xen.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/arch/x86/kernel/smp_64-xen.c      2008-12-15 11:26:44.000000000 +0100
 @@ -384,12 +384,17 @@ int smp_call_function_single (int cpu, v
                put_cpu();
                return 0;
@@ -5179,8 +5179,8 @@ Acked-by: jbeulich@novell.com
  
  /*
   * this function sends a 'generic call function' IPI to all other CPUs
---- sle11-2009-05-14.orig/arch/x86/kernel/traps_64-xen.c       2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/traps_64-xen.c    2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/arch/x86/kernel/traps_64-xen.c       2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/arch/x86/kernel/traps_64-xen.c    2008-12-15 11:26:44.000000000 +0100
 @@ -30,9 +30,10 @@
  #include <linux/kprobes.h>
  #include <linux/kexec.h>
@@ -5406,8 +5406,8 @@ Acked-by: jbeulich@novell.com
 -}
 -early_param("call_trace", call_trace_setup);
 -#endif
---- sle11-2009-05-14.orig/arch/x86/kernel/vsyscall_64-xen.c    2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/kernel/vsyscall_64-xen.c 2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/arch/x86/kernel/vsyscall_64-xen.c    2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/arch/x86/kernel/vsyscall_64-xen.c 2008-12-15 11:26:44.000000000 +0100
 @@ -42,6 +42,7 @@
  #include <asm/topology.h>
  
@@ -5449,8 +5449,8 @@ Acked-by: jbeulich@novell.com
        __set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_page0, PAGE_KERNEL_VSYSCALL);
  }
  
---- sle11-2009-05-14.orig/arch/x86/mm/fault_64-xen.c   2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/mm/fault_64-xen.c        2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/arch/x86/mm/fault_64-xen.c   2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/arch/x86/mm/fault_64-xen.c        2008-12-15 11:26:44.000000000 +0100
 @@ -23,9 +23,9 @@
  #include <linux/compiler.h>
  #include <linux/module.h>
@@ -5498,8 +5498,8 @@ Acked-by: jbeulich@novell.com
  } 
  
  void dump_pagetable(unsigned long address)
---- sle11-2009-05-14.orig/arch/x86/mm/init_64-xen.c    2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/mm/init_64-xen.c 2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/arch/x86/mm/init_64-xen.c    2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/arch/x86/mm/init_64-xen.c 2008-12-15 11:26:44.000000000 +0100
 @@ -1127,14 +1127,15 @@ static __init int x8664_sysctl_init(void
  __initcall(x8664_sysctl_init);
  #endif
@@ -5519,8 +5519,8 @@ Acked-by: jbeulich@novell.com
  };
  
  struct vm_area_struct *get_gate_vma(struct task_struct *tsk)
---- sle11-2009-05-14.orig/arch/x86/mm/pageattr_64-xen.c        2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/arch/x86/mm/pageattr_64-xen.c     2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/arch/x86/mm/pageattr_64-xen.c        2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/arch/x86/mm/pageattr_64-xen.c     2008-12-15 11:26:44.000000000 +0100
 @@ -330,34 +330,40 @@ static struct page *split_large_page(uns
        return base;
  } 
@@ -5607,8 +5607,8 @@ Acked-by: jbeulich@novell.com
        } 
  } 
  
---- sle11-2009-05-14.orig/drivers/pci/msi-xen.c        2009-04-24 13:31:56.000000000 +0200
-+++ sle11-2009-05-14/drivers/pci/msi-xen.c     2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/drivers/pci/msi-xen.c        2009-04-24 13:31:56.000000000 +0200
++++ sle11-2009-06-29/drivers/pci/msi-xen.c     2008-12-15 11:26:44.000000000 +0100
 @@ -263,10 +263,8 @@ void disable_msi_mode(struct pci_dev *de
                pci_write_config_word(dev, msi_control_reg(pos), control);
                dev->msix_enabled = 0;
@@ -5635,8 +5635,8 @@ Acked-by: jbeulich@novell.com
  }
  
  #ifdef CONFIG_PM
---- sle11-2009-05-14.orig/drivers/xen/balloon/balloon.c        2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/drivers/xen/balloon/balloon.c     2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/drivers/xen/balloon/balloon.c        2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/drivers/xen/balloon/balloon.c     2009-06-29 15:28:36.000000000 +0200
 @@ -97,8 +97,8 @@ extern unsigned long totalhigh_pages;
  static LIST_HEAD(ballooned_pages);
  
@@ -5648,7 +5648,7 @@ Acked-by: jbeulich@novell.com
  static struct timer_list balloon_timer;
  
  /* When ballooning out (allocating memory to return to Xen) we don't really 
-@@ -389,7 +389,7 @@ static int decrease_reservation(unsigned
+@@ -375,7 +375,7 @@ static int decrease_reservation(unsigned
   * by the balloon lock), or with changes to the Xen hard limit, but we will
   * recover from these in time.
   */
@@ -5657,8 +5657,8 @@ Acked-by: jbeulich@novell.com
  {
        int need_sleep = 0;
        long credit;
---- sle11-2009-05-14.orig/drivers/xen/blkback/blkback.c        2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/drivers/xen/blkback/blkback.c     2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/drivers/xen/blkback/blkback.c        2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/drivers/xen/blkback/blkback.c     2008-12-15 11:26:44.000000000 +0100
 @@ -37,6 +37,7 @@
  
  #include <linux/spinlock.h>
@@ -5667,8 +5667,8 @@ Acked-by: jbeulich@novell.com
  #include <linux/list.h>
  #include <linux/delay.h>
  #include <xen/balloon.h>
---- sle11-2009-05-14.orig/drivers/xen/blkback/interface.c      2009-05-14 11:02:41.000000000 +0200
-+++ sle11-2009-05-14/drivers/xen/blkback/interface.c   2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/drivers/xen/blkback/interface.c      2009-06-29 15:14:52.000000000 +0200
++++ sle11-2009-06-29/drivers/xen/blkback/interface.c   2008-12-15 11:26:44.000000000 +0100
 @@ -34,7 +34,7 @@
  #include <xen/evtchn.h>
  #include <linux/kthread.h>
@@ -5678,8 +5678,8 @@ Acked-by: jbeulich@novell.com
  
  blkif_t *blkif_alloc(domid_t domid)
  {
---- sle11-2009-05-14.orig/drivers/xen/blkfront/blkfront.c      2009-03-24 10:08:16.000000000 +0100
-+++ sle11-2009-05-14/drivers/xen/blkfront/blkfront.c   2009-03-24 10:08:27.000000000 +0100
+--- sle11-2009-06-29.orig/drivers/xen/blkfront/blkfront.c      2009-03-24 10:08:16.000000000 +0100
++++ sle11-2009-06-29/drivers/xen/blkfront/blkfront.c   2009-03-24 10:08:27.000000000 +0100
 @@ -71,7 +71,7 @@ static int setup_blkring(struct xenbus_d
  static void kick_pending_request_queues(struct blkfront_info *);
  
@@ -5710,8 +5710,8 @@ Acked-by: jbeulich@novell.com
        spin_lock_irq(&blkif_io_lock);
        if (info->connected == BLKIF_STATE_CONNECTED)
                kick_pending_request_queues(info);
---- sle11-2009-05-14.orig/drivers/xen/blktap/blktap.c  2009-04-20 11:37:34.000000000 +0200
-+++ sle11-2009-05-14/drivers/xen/blktap/blktap.c       2009-04-20 11:37:50.000000000 +0200
+--- sle11-2009-06-29.orig/drivers/xen/blktap/blktap.c  2009-04-20 11:37:34.000000000 +0200
++++ sle11-2009-06-29/drivers/xen/blktap/blktap.c       2009-04-20 11:37:50.000000000 +0200
 @@ -40,6 +40,7 @@
  
  #include <linux/spinlock.h>
@@ -5720,8 +5720,8 @@ Acked-by: jbeulich@novell.com
  #include <linux/list.h>
  #include <asm/hypervisor.h>
  #include "common.h"
---- sle11-2009-05-14.orig/drivers/xen/blktap/interface.c       2009-05-14 11:02:41.000000000 +0200
-+++ sle11-2009-05-14/drivers/xen/blktap/interface.c    2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/drivers/xen/blktap/interface.c       2009-06-29 15:14:52.000000000 +0200
++++ sle11-2009-06-29/drivers/xen/blktap/interface.c    2008-12-15 11:26:44.000000000 +0100
 @@ -34,7 +34,7 @@
  #include "common.h"
  #include <xen/evtchn.h>
@@ -5731,8 +5731,8 @@ Acked-by: jbeulich@novell.com
  
  blkif_t *tap_alloc_blkif(domid_t domid)
  {
---- sle11-2009-05-14.orig/drivers/xen/char/mem.c       2009-05-14 11:02:41.000000000 +0200
-+++ sle11-2009-05-14/drivers/xen/char/mem.c    2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/drivers/xen/char/mem.c       2009-06-29 15:14:52.000000000 +0200
++++ sle11-2009-06-29/drivers/xen/char/mem.c    2008-12-15 11:26:44.000000000 +0100
 @@ -157,7 +157,7 @@ static loff_t memory_lseek(struct file *
  {
        loff_t ret;
@@ -5751,8 +5751,8 @@ Acked-by: jbeulich@novell.com
        return ret;
  }
  
---- sle11-2009-05-14.orig/drivers/xen/console/console.c        2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/drivers/xen/console/console.c     2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/drivers/xen/console/console.c        2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/drivers/xen/console/console.c     2008-12-15 11:26:44.000000000 +0100
 @@ -85,11 +85,6 @@ static int xc_num = -1;
  #define XEN_HVC_MAJOR 229
  #define XEN_HVC_MINOR 0
@@ -5787,8 +5787,8 @@ Acked-by: jbeulich@novell.com
                        if (buf[i] == '\x0f') { /* ^O */
                                if (!sysrq_requested) {
                                        sysrq_requested = jiffies;
---- sle11-2009-05-14.orig/drivers/xen/core/reboot.c    2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/drivers/xen/core/reboot.c 2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/drivers/xen/core/reboot.c    2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/drivers/xen/core/reboot.c 2008-12-15 11:26:44.000000000 +0100
 @@ -34,8 +34,8 @@ static int suspend_cancelled;
  /* Can we leave APs online when we suspend? */
  static int fast_suspend;
@@ -5824,8 +5824,8 @@ Acked-by: jbeulich@novell.com
  {
        int err;
  
---- sle11-2009-05-14.orig/drivers/xen/core/smpboot.c   2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/drivers/xen/core/smpboot.c        2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/drivers/xen/core/smpboot.c   2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/drivers/xen/core/smpboot.c        2008-12-15 11:26:44.000000000 +0100
 @@ -161,7 +161,12 @@ static void xen_smp_intr_exit(unsigned i
  
  void __cpuinit cpu_bringup(void)
@@ -5878,8 +5878,8 @@ Acked-by: jbeulich@novell.com
  #ifdef __x86_64__
                cpu_pda(cpu)->pcurrent = idle;
                cpu_pda(cpu)->cpunumber = cpu;
---- sle11-2009-05-14.orig/drivers/xen/fbfront/xenfb.c  2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/drivers/xen/fbfront/xenfb.c       2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/drivers/xen/fbfront/xenfb.c  2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/drivers/xen/fbfront/xenfb.c       2008-12-15 11:26:44.000000000 +0100
 @@ -25,6 +25,7 @@
  #include <linux/vmalloc.h>
  #include <linux/mm.h>
@@ -5888,8 +5888,8 @@ Acked-by: jbeulich@novell.com
  #include <asm/hypervisor.h>
  #include <xen/evtchn.h>
  #include <xen/interface/io/fbif.h>
---- sle11-2009-05-14.orig/drivers/xen/netback/loopback.c       2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/drivers/xen/netback/loopback.c    2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/drivers/xen/netback/loopback.c       2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/drivers/xen/netback/loopback.c    2008-12-15 11:26:44.000000000 +0100
 @@ -54,6 +54,7 @@
  #include <net/dst.h>
  #include <net/xfrm.h>         /* secpath_reset() */
@@ -5898,8 +5898,8 @@ Acked-by: jbeulich@novell.com
  
  static int nloopbacks = -1;
  module_param(nloopbacks, int, 0);
---- sle11-2009-05-14.orig/drivers/xen/pciback/conf_space_header.c      2009-05-14 11:02:41.000000000 +0200
-+++ sle11-2009-05-14/drivers/xen/pciback/conf_space_header.c   2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/drivers/xen/pciback/conf_space_header.c      2009-06-29 15:14:52.000000000 +0200
++++ sle11-2009-06-29/drivers/xen/pciback/conf_space_header.c   2008-12-15 11:26:44.000000000 +0100
 @@ -22,14 +22,14 @@ static int command_write(struct pci_dev 
  {
        int err;
@@ -5917,8 +5917,8 @@ Acked-by: jbeulich@novell.com
                if (unlikely(verbose_request))
                        printk(KERN_DEBUG "pciback: %s: disable\n",
                               pci_name(dev));
---- sle11-2009-05-14.orig/drivers/xen/pciback/pciback.h        2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/drivers/xen/pciback/pciback.h     2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/drivers/xen/pciback/pciback.h        2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/drivers/xen/pciback/pciback.h     2008-12-15 11:26:44.000000000 +0100
 @@ -88,7 +88,7 @@ void pciback_release_devices(struct pcib
  
  /* Handles events from front-end */
@@ -5928,8 +5928,8 @@ Acked-by: jbeulich@novell.com
  
  int pciback_xenbus_register(void);
  void pciback_xenbus_unregister(void);
---- sle11-2009-05-14.orig/drivers/xen/pciback/pciback_ops.c    2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/drivers/xen/pciback/pciback_ops.c 2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/drivers/xen/pciback/pciback_ops.c    2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/drivers/xen/pciback/pciback_ops.c 2008-12-15 11:26:44.000000000 +0100
 @@ -25,7 +25,7 @@ void pciback_reset_device(struct pci_dev
  
                pci_write_config_word(dev, PCI_COMMAND, 0);
@@ -5951,8 +5951,8 @@ Acked-by: jbeulich@novell.com
        struct pci_dev *dev;
        struct xen_pci_op *op = &pdev->sh_info->op;
  
---- sle11-2009-05-14.orig/drivers/xen/pciback/xenbus.c 2009-05-14 11:02:41.000000000 +0200
-+++ sle11-2009-05-14/drivers/xen/pciback/xenbus.c      2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/drivers/xen/pciback/xenbus.c 2009-06-29 15:14:52.000000000 +0200
++++ sle11-2009-06-29/drivers/xen/pciback/xenbus.c      2008-12-15 11:26:44.000000000 +0100
 @@ -32,7 +32,7 @@ static struct pciback_device *alloc_pdev
        pdev->evtchn_irq = INVALID_EVTCHN_IRQ;
        pdev->be_watching = 0;
@@ -5970,8 +5970,8 @@ Acked-by: jbeulich@novell.com
        flush_scheduled_work();
  
        if (pdev->sh_info != NULL) {
---- sle11-2009-05-14.orig/drivers/xen/scsiback/interface.c     2009-05-14 11:02:41.000000000 +0200
-+++ sle11-2009-05-14/drivers/xen/scsiback/interface.c  2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/drivers/xen/scsiback/interface.c     2009-06-29 15:14:52.000000000 +0200
++++ sle11-2009-06-29/drivers/xen/scsiback/interface.c  2008-12-15 11:26:44.000000000 +0100
 @@ -39,7 +39,7 @@
  #include <linux/kthread.h>
  
@@ -5981,8 +5981,8 @@ Acked-by: jbeulich@novell.com
  
  struct vscsibk_info *vscsibk_info_alloc(domid_t domid)
  {
---- sle11-2009-05-14.orig/drivers/xen/scsiback/scsiback.c      2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/drivers/xen/scsiback/scsiback.c   2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/drivers/xen/scsiback/scsiback.c      2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/drivers/xen/scsiback/scsiback.c   2008-12-15 11:26:44.000000000 +0100
 @@ -322,13 +322,11 @@ static int scsiback_merge_bio(struct req
  
        if (!rq->bio)
@@ -5998,8 +5998,8 @@ Acked-by: jbeulich@novell.com
        }
  
        return 0;
---- sle11-2009-05-14.orig/drivers/xen/sfc_netfront/accel_vi.c  2009-03-30 16:35:11.000000000 +0200
-+++ sle11-2009-05-14/drivers/xen/sfc_netfront/accel_vi.c       2009-03-30 16:35:25.000000000 +0200
+--- sle11-2009-06-29.orig/drivers/xen/sfc_netfront/accel_vi.c  2009-03-30 16:35:11.000000000 +0200
++++ sle11-2009-06-29/drivers/xen/sfc_netfront/accel_vi.c       2009-03-30 16:35:25.000000000 +0200
 @@ -463,7 +463,7 @@ netfront_accel_enqueue_skb_multi(netfron
  
        if (skb->ip_summed == CHECKSUM_PARTIAL) {
@@ -6018,8 +6018,8 @@ Acked-by: jbeulich@novell.com
        }
        NETFRONT_ACCEL_PKTBUFF_FOR_EACH_FRAGMENT
                (skb, idx, frag_data, frag_len, {
---- sle11-2009-05-14.orig/drivers/xen/tpmback/interface.c      2009-05-14 11:02:41.000000000 +0200
-+++ sle11-2009-05-14/drivers/xen/tpmback/interface.c   2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/drivers/xen/tpmback/interface.c      2009-06-29 15:14:52.000000000 +0200
++++ sle11-2009-06-29/drivers/xen/tpmback/interface.c   2008-12-15 11:26:44.000000000 +0100
 @@ -15,7 +15,7 @@
  #include <xen/balloon.h>
  #include <xen/gnttab.h>
@@ -6029,8 +6029,8 @@ Acked-by: jbeulich@novell.com
  int num_frontends = 0;
  
  LIST_HEAD(tpmif_list);
---- sle11-2009-05-14.orig/drivers/xen/xenbus/xenbus_comms.c    2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/drivers/xen/xenbus/xenbus_comms.c 2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/drivers/xen/xenbus/xenbus_comms.c    2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/drivers/xen/xenbus/xenbus_comms.c 2008-12-15 11:26:44.000000000 +0100
 @@ -49,9 +49,9 @@
  
  static int xenbus_irq;
@@ -6043,8 +6043,8 @@ Acked-by: jbeulich@novell.com
  
  static DECLARE_WAIT_QUEUE_HEAD(xb_waitq);
  
---- sle11-2009-05-14.orig/drivers/xen/xenbus/xenbus_probe.c    2008-11-25 12:35:56.000000000 +0100
-+++ sle11-2009-05-14/drivers/xen/xenbus/xenbus_probe.c 2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/drivers/xen/xenbus/xenbus_probe.c    2008-11-25 12:35:56.000000000 +0100
++++ sle11-2009-06-29/drivers/xen/xenbus/xenbus_probe.c 2008-12-15 11:26:44.000000000 +0100
 @@ -843,7 +843,7 @@ void unregister_xenstore_notifier(struct
  EXPORT_SYMBOL_GPL(unregister_xenstore_notifier);
  
@@ -6054,8 +6054,8 @@ Acked-by: jbeulich@novell.com
  {
        BUG_ON((xenstored_ready <= 0));
  
---- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/desc_32.h       2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/desc_32.h    2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/include/asm-x86/mach-xen/asm/desc_32.h       2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/desc_32.h    2008-12-15 11:26:44.000000000 +0100
 @@ -4,8 +4,6 @@
  #include <asm/ldt.h>
  #include <asm/segment.h>
@@ -6241,8 +6241,8 @@ Acked-by: jbeulich@novell.com
  #endif /* !__ASSEMBLY__ */
  
  #endif
---- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/dma-mapping_32.h        2009-05-14 11:02:41.000000000 +0200
-+++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/dma-mapping_32.h     2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/include/asm-x86/mach-xen/asm/dma-mapping_32.h        2009-06-29 15:14:52.000000000 +0200
++++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/dma-mapping_32.h     2008-12-15 11:26:44.000000000 +0100
 @@ -127,10 +127,10 @@ dma_get_cache_alignment(void)
        return (1 << INTERNODE_CACHE_SHIFT);
  }
@@ -6256,8 +6256,8 @@ Acked-by: jbeulich@novell.com
               enum dma_data_direction direction)
  {
        flush_write_buffers();
---- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/fixmap_32.h     2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/fixmap_32.h  2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/include/asm-x86/mach-xen/asm/fixmap_32.h     2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/fixmap_32.h  2008-12-15 11:26:44.000000000 +0100
 @@ -13,13 +13,16 @@
  #ifndef _ASM_FIXMAP_H
  #define _ASM_FIXMAP_H
@@ -6276,8 +6276,8 @@ Acked-by: jbeulich@novell.com
  
  #ifndef __ASSEMBLY__
  #include <linux/kernel.h>
---- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/highmem.h       2009-05-14 11:02:41.000000000 +0200
-+++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/highmem.h    2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/include/asm-x86/mach-xen/asm/highmem.h       2009-06-29 15:14:52.000000000 +0200
++++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/highmem.h    2008-12-15 11:26:44.000000000 +0100
 @@ -85,7 +85,7 @@ static inline void clear_user_highpage(s
  
  void copy_highpage(struct page *to, struct page *from);
@@ -6287,8 +6287,8 @@ Acked-by: jbeulich@novell.com
  {
        copy_highpage(to, from);
  }
---- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/hypervisor.h    2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/hypervisor.h 2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/include/asm-x86/mach-xen/asm/hypervisor.h    2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/hypervisor.h 2008-12-15 11:26:44.000000000 +0100
 @@ -46,15 +46,6 @@
  #include <asm/percpu.h>
  #include <asm/ptrace.h>
@@ -6305,8 +6305,8 @@ Acked-by: jbeulich@novell.com
  
  extern shared_info_t *HYPERVISOR_shared_info;
  
---- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/irqflags_32.h   2009-05-14 11:02:41.000000000 +0200
-+++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/irqflags_32.h        2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/include/asm-x86/mach-xen/asm/irqflags_32.h   2009-06-29 15:14:52.000000000 +0200
++++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/irqflags_32.h        2008-12-15 11:26:44.000000000 +0100
 @@ -22,9 +22,6 @@
  
  #define __raw_local_save_flags() (current_vcpu_info()->evtchn_upcall_mask)
@@ -6399,8 +6399,8 @@ Acked-by: jbeulich@novell.com
  #endif /* __ASSEMBLY__ */
  
  /*
---- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/mmu_context_32.h        2009-05-14 11:02:41.000000000 +0200
-+++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/mmu_context_32.h     2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/include/asm-x86/mach-xen/asm/mmu_context_32.h        2009-06-29 15:14:52.000000000 +0200
++++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/mmu_context_32.h     2008-12-15 11:26:44.000000000 +0100
 @@ -27,14 +27,13 @@ static inline void enter_lazy_tlb(struct
  static inline void __prepare_arch_switch(void)
  {
@@ -6440,8 +6440,8 @@ Acked-by: jbeulich@novell.com
  
  static inline void activate_mm(struct mm_struct *prev, struct mm_struct *next)
  {
---- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/pgtable-3level.h        2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/pgtable-3level.h     2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/include/asm-x86/mach-xen/asm/pgtable-3level.h        2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/pgtable-3level.h     2008-12-15 11:26:44.000000000 +0100
 @@ -1,8 +1,6 @@
  #ifndef _I386_PGTABLE_3LEVEL_H
  #define _I386_PGTABLE_3LEVEL_H
@@ -6540,8 +6540,8 @@ Acked-by: jbeulich@novell.com
  #define __pte_mfn(_pte) (((_pte).pte_low >> PAGE_SHIFT) | \
                         ((_pte).pte_high << (32-PAGE_SHIFT)))
  #define pte_mfn(_pte) ((_pte).pte_low & _PAGE_PRESENT ? \
---- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/pgtable_32.h    2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/pgtable_32.h 2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/include/asm-x86/mach-xen/asm/pgtable_32.h    2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/pgtable_32.h 2008-12-15 11:26:44.000000000 +0100
 @@ -38,14 +38,14 @@ struct vm_area_struct;
  #define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page))
  extern unsigned long empty_zero_page[1024];
@@ -6590,8 +6590,8 @@ Acked-by: jbeulich@novell.com
  #define __HAVE_ARCH_PTEP_GET_AND_CLEAR_FULL
  #define ptep_get_and_clear_full(mm, addr, ptep, full)                 \
        ((full) ? ({                                                    \
---- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/processor_32.h  2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/processor_32.h       2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/include/asm-x86/mach-xen/asm/processor_32.h  2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/processor_32.h       2008-12-15 11:26:44.000000000 +0100
 @@ -20,6 +20,7 @@
  #include <linux/threads.h>
  #include <asm/percpu.h>
@@ -6870,8 +6870,8 @@ Acked-by: jbeulich@novell.com
 +extern void secondary_cpu_init(void);
 +
  #endif /* __ASM_I386_PROCESSOR_H */
---- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/segment_32.h    2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/segment_32.h 2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/include/asm-x86/mach-xen/asm/segment_32.h    2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/segment_32.h 2008-12-15 11:26:44.000000000 +0100
 @@ -39,7 +39,7 @@
   *  25 - APM BIOS support 
   *
@@ -6891,8 +6891,8 @@ Acked-by: jbeulich@novell.com
  #define GDT_ENTRY_DOUBLEFAULT_TSS     31
  
  /*
---- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/smp_32.h        2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/smp_32.h     2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/include/asm-x86/mach-xen/asm/smp_32.h        2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/smp_32.h     2008-12-15 11:26:44.000000000 +0100
 @@ -8,6 +8,7 @@
  #include <linux/kernel.h>
  #include <linux/threads.h>
@@ -6910,8 +6910,8 @@ Acked-by: jbeulich@novell.com
  
  extern cpumask_t cpu_possible_map;
  #define cpu_callin_map cpu_possible_map
---- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/system_32.h     2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/system_32.h  2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/include/asm-x86/mach-xen/asm/system_32.h     2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/system_32.h  2008-12-15 11:26:44.000000000 +0100
 @@ -139,17 +139,17 @@ __asm__ __volatile__ ("movw %%dx,%1\n\t"
  #define write_cr4(x) \
        __asm__ __volatile__("movl %0,%%cr4": :"r" (x))
@@ -6936,8 +6936,8 @@ Acked-by: jbeulich@novell.com
  static inline unsigned long get_limit(unsigned long segment)
  {
        unsigned long __limit;
---- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/desc_64.h       2009-05-14 11:02:41.000000000 +0200
-+++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/desc_64.h    2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/include/asm-x86/mach-xen/asm/desc_64.h       2009-06-29 15:14:52.000000000 +0200
++++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/desc_64.h    2008-12-15 11:26:44.000000000 +0100
 @@ -9,62 +9,11 @@
  
  #include <linux/string.h>
@@ -7002,8 +7002,8 @@ Acked-by: jbeulich@novell.com
  extern struct desc_ptr idt_descr, cpu_gdt_descr[NR_CPUS];
  
  extern struct desc_struct cpu_gdt_table[GDT_ENTRIES];
---- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/dma-mapping_64.h        2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/dma-mapping_64.h     2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/include/asm-x86/mach-xen/asm/dma-mapping_64.h        2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/dma-mapping_64.h     2008-12-15 11:26:44.000000000 +0100
 @@ -64,6 +64,9 @@ static inline int dma_mapping_error(dma_
        return (dma_addr == bad_dma_address);
  }
@@ -7030,8 +7030,8 @@ Acked-by: jbeulich@novell.com
  {
        flush_write_buffers();
  }
---- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/pgtable_64.h    2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/pgtable_64.h 2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/include/asm-x86/mach-xen/asm/pgtable_64.h    2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/pgtable_64.h 2008-12-15 11:26:44.000000000 +0100
 @@ -237,19 +237,18 @@ extern unsigned int __kernel_page_user;
  
  static inline unsigned long pgd_bad(pgd_t pgd)
@@ -7071,8 +7071,8 @@ Acked-by: jbeulich@novell.com
  #define pfn_pmd(nr,prot) (__pmd(((nr) << PAGE_SHIFT) | pgprot_val(prot)))
  #define pmd_pfn(x)  ((pmd_val(x) & __PHYSICAL_MASK) >> PAGE_SHIFT)
  
---- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/processor_64.h  2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/processor_64.h       2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/include/asm-x86/mach-xen/asm/processor_64.h  2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/processor_64.h       2008-12-15 11:26:44.000000000 +0100
 @@ -484,6 +484,14 @@ static inline void __mwait(unsigned long
                : :"a" (eax), "c" (ecx));
  }
@@ -7088,8 +7088,8 @@ Acked-by: jbeulich@novell.com
  extern void mwait_idle_with_hints(unsigned long eax, unsigned long ecx);
  
  #define stack_current() \
---- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/smp_64.h        2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/smp_64.h     2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/include/asm-x86/mach-xen/asm/smp_64.h        2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/include/asm-x86/mach-xen/asm/smp_64.h     2008-12-15 11:26:44.000000000 +0100
 @@ -88,11 +88,6 @@ extern u8 x86_cpu_to_log_apicid[NR_CPUS]
  extern u8 bios_cpu_apicid[];
  
@@ -7116,8 +7116,8 @@ Acked-by: jbeulich@novell.com
  #endif /* !CONFIG_SMP */
  #endif
  
---- sle11-2009-05-14.orig/kernel/kexec.c       2009-02-17 11:27:16.000000000 +0100
-+++ sle11-2009-05-14/kernel/kexec.c    2009-02-17 11:34:22.000000000 +0100
+--- sle11-2009-06-29.orig/kernel/kexec.c       2009-02-17 11:27:16.000000000 +0100
++++ sle11-2009-06-29/kernel/kexec.c    2009-02-17 11:34:22.000000000 +0100
 @@ -374,7 +374,7 @@ static struct page *kimage_alloc_pages(g
                if (limit == ~0UL)
                        address_bits = BITS_PER_LONG;
@@ -7127,8 +7127,8 @@ Acked-by: jbeulich@novell.com
  
                if (xen_limit_pages_to_max_mfn(pages, order, address_bits) < 0) {
                        __free_pages(pages, order);
---- sle11-2009-05-14.orig/net/core/dev.c       2009-03-04 11:28:34.000000000 +0100
-+++ sle11-2009-05-14/net/core/dev.c    2008-12-15 11:26:44.000000000 +0100
+--- sle11-2009-06-29.orig/net/core/dev.c       2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-06-29/net/core/dev.c    2008-12-15 11:26:44.000000000 +0100
 @@ -1751,10 +1751,10 @@ inline int skb_checksum_setup(struct sk_
                        goto out;
                switch (skb->nh.iph->protocol) {
IPFire 2.x development tree