Updated xen patches taken from suse.

[people/pmueller/ipfire-2.x.git] / src / patches / suse-2.6.27.25 / patches.xen / xen3-patch-2.6.27.1-2

diff --git a/src/patches/60037_xen3-patch-2.6.27.1-2.patch1 b/src/patches/suse-2.6.27.25/patches.xen/xen3-patch-2.6.27.1-2
similarity index 56%
rename from src/patches/60037_xen3-patch-2.6.27.1-2.patch1
rename to src/patches/suse-2.6.27.25/patches.xen/xen3-patch-2.6.27.1-2
index f4a42e09b734a0862c436c0af011fade3ac40b33..58ccd138c835196172ca6e020a7caa4eeff953f1 100644 (file)
--- a/src/patches/60037_xen3-patch-2.6.27.1-2.patch1
+++ b/src/patches/suse-2.6.27.25/patches.xen/xen3-patch-2.6.27.1-2
@@ -7,10 +7,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 Automatically created from "patches.kernel.org/patch-2.6.27.1-2" by xen-port-patches.py
 
-Index: head-2008-11-25/arch/x86/kernel/io_apic_32-xen.c
-===================================================================
---- head-2008-11-25.orig/arch/x86/kernel/io_apic_32-xen.c      2008-11-25 14:37:19.000000000 +0100
-+++ head-2008-11-25/arch/x86/kernel/io_apic_32-xen.c   2008-11-25 14:37:27.000000000 +0100
+--- head-2009-01-06.orig/arch/x86/kernel/io_apic_32-xen.c      2008-12-15 11:28:15.000000000 +0100
++++ head-2009-01-06/arch/x86/kernel/io_apic_32-xen.c   2008-11-25 14:37:27.000000000 +0100
 @@ -2381,6 +2381,9 @@ void __init setup_IO_APIC(void)
        /* Reserve all the system vectors. */
        for (i = first_system_vector; i < NR_VECTORS; i++)
@@ -21,11 +19,9 @@ Index: head-2008-11-25/arch/x86/kernel/io_apic_32-xen.c
  #endif
  
        enable_IO_APIC();
-Index: head-2008-11-25/arch/x86/mm/ioremap-xen.c
-===================================================================
---- head-2008-11-25.orig/arch/x86/mm/ioremap-xen.c     2008-11-27 09:34:01.000000000 +0100
-+++ head-2008-11-25/arch/x86/mm/ioremap-xen.c  2008-11-27 09:36:21.000000000 +0100
-@@ -784,7 +784,7 @@ void __init *early_ioremap(unsigned long
+--- head-2009-01-06.orig/arch/x86/mm/ioremap-xen.c     2009-01-07 10:49:11.000000000 +0100
++++ head-2009-01-06/arch/x86/mm/ioremap-xen.c  2009-01-07 10:51:24.000000000 +0100
+@@ -786,7 +786,7 @@ void __init *early_ioremap(unsigned long
         */
        offset = phys_addr & ~PAGE_MASK;
        phys_addr &= PAGE_MASK;