Imported linux-2.6.27.39 suse/xen patches.

[people/pmueller/ipfire-2.x.git] / src / patches / suse-2.6.27.39 / patches.xen / xen3-x86-fix-kmap-contig.patch

diff --git a/src/patches/suse-2.6.27.31/patches.xen/xen3-x86-fix-kmap-contig.patch b/src/patches/suse-2.6.27.39/patches.xen/xen3-x86-fix-kmap-contig.patch
similarity index 92%
rename from src/patches/suse-2.6.27.31/patches.xen/xen3-x86-fix-kmap-contig.patch
rename to src/patches/suse-2.6.27.39/patches.xen/xen3-x86-fix-kmap-contig.patch
index 2efc9eedd729ce89483455033aad68addd015f9c..3291da57b21d862bdf937ada1267680531ef797a 100644 (file)
--- a/src/patches/suse-2.6.27.31/patches.xen/xen3-x86-fix-kmap-contig.patch
+++ b/src/patches/suse-2.6.27.39/patches.xen/xen3-x86-fix-kmap-contig.patch
@@ -36,8 +36,8 @@ Signed-off-by: Jan Beulich <jbeulich@novell.com>
 
 Automatically created from "patches.arch/x86-fix-kmap-contig.patch" by xen-port-patches.py
 
---- sle11-2009-04-20.orig/arch/x86/mm/init_32-xen.c    2009-04-24 13:36:23.000000000 +0200
-+++ sle11-2009-04-20/arch/x86/mm/init_32-xen.c 2009-02-17 18:06:20.000000000 +0100
+--- sle11-2009-09-18.orig/arch/x86/mm/init_32-xen.c    2009-03-16 16:39:50.000000000 +0100
++++ sle11-2009-09-18/arch/x86/mm/init_32-xen.c 2009-02-17 18:06:20.000000000 +0100
 @@ -148,6 +148,52 @@ static pte_t * __init one_page_table_ini
        return pte_offset_kernel(pmd, 0);
  }
@@ -131,8 +131,8 @@ Automatically created from "patches.arch/x86-fix-kmap-contig.patch" by xen-port-
  
        table_start = extend_init_mapping(tables);
  
---- sle11-2009-04-20.orig/arch/x86/mm/ioremap-xen.c    2009-04-24 13:36:23.000000000 +0200
-+++ sle11-2009-04-20/arch/x86/mm/ioremap-xen.c 2009-01-16 10:45:51.000000000 +0100
+--- sle11-2009-09-18.orig/arch/x86/mm/ioremap-xen.c    2009-01-07 10:51:24.000000000 +0100
++++ sle11-2009-09-18/arch/x86/mm/ioremap-xen.c 2009-01-16 10:45:51.000000000 +0100
 @@ -669,35 +669,9 @@ void __init early_ioremap_init(void)
  }
  
@@ -169,8 +169,8 @@ Automatically created from "patches.arch/x86-fix-kmap-contig.patch" by xen-port-
  }
  #endif /* CONFIG_X86_32 */
  
---- sle11-2009-04-20.orig/include/asm-x86/mach-xen/asm/io.h    2009-04-24 13:36:23.000000000 +0200
-+++ sle11-2009-04-20/include/asm-x86/mach-xen/asm/io.h 2009-04-24 13:36:29.000000000 +0200
+--- sle11-2009-09-18.orig/include/asm-x86/mach-xen/asm/io.h    2009-09-24 11:02:00.000000000 +0200
++++ sle11-2009-09-18/include/asm-x86/mach-xen/asm/io.h 2009-09-24 11:02:57.000000000 +0200
 @@ -12,7 +12,6 @@
   */
  #ifndef __ASSEMBLY__
@@ -179,7 +179,7 @@ Automatically created from "patches.arch/x86-fix-kmap-contig.patch" by xen-port-
  extern void early_ioremap_reset(void);
  extern void *early_ioremap(unsigned long offset, unsigned long size);
  extern void early_iounmap(void *addr, unsigned long size);
-@@ -131,7 +130,6 @@ extern void __iomem *ioremap_wc(unsigned
+@@ -132,7 +131,6 @@ extern void __iomem *ioremap_wc(unsigned
   * A boot-time mapping is currently limited to at most 16 pages.
   */
  extern void early_ioremap_init(void);