Updated xen patches taken from suse.

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

diff --git a/src/patches/60048_xen-sections.patch1 b/src/patches/suse-2.6.27.25/patches.xen/xen-sections
similarity index 60%
rename from src/patches/60048_xen-sections.patch1
rename to src/patches/suse-2.6.27.25/patches.xen/xen-sections
index 19c57c66dcfba784d4bb56452af87a23721ef951..3d90bb8547f70628412104fab62c97457c183458 100644 (file)
--- a/src/patches/60048_xen-sections.patch1
+++ b/src/patches/suse-2.6.27.25/patches.xen/xen-sections
@@ -2,23 +2,19 @@ From: jbeulich@novell.com
 Subject: fix placement of some routines/data
 Patch-mainline: obsolete
 
-Index: head-2008-12-01/arch/x86/kernel/e820-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/e820-xen.c    2008-12-01 11:49:07.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/e820-xen.c 2008-12-01 12:07:15.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/e820-xen.c   2009-05-06 10:29:07.000000000 +0200
++++ sle11-2009-05-14/arch/x86/kernel/e820-xen.c        2009-02-17 14:01:20.000000000 +0100
 @@ -42,7 +42,7 @@
   * user can e.g. boot the original kernel with mem=1G while still booting the
   * next kernel with full memory.
   */
 -struct e820map e820;
 +struct e820map __initdata e820;
+ #ifndef CONFIG_XEN
  struct e820map e820_saved;
- #ifdef CONFIG_XEN
- static struct e820map machine_e820;
-Index: head-2008-12-01/arch/x86/kernel/process_32-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/process_32-xen.c      2008-12-01 12:06:01.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/process_32-xen.c   2008-12-01 12:07:15.000000000 +0100
+ #else
+--- sle11-2009-05-14.orig/arch/x86/kernel/process_32-xen.c     2008-10-01 16:20:58.000000000 +0200
++++ sle11-2009-05-14/arch/x86/kernel/process_32-xen.c  2008-12-01 12:07:15.000000000 +0100
 @@ -99,7 +99,7 @@ static void cpu_exit_clear(void)
  }
  #endif
@@ -28,10 +24,8 @@ Index: head-2008-12-01/arch/x86/kernel/process_32-xen.c
  {
        idle_task_exit();
        local_irq_disable();
-Index: head-2008-12-01/arch/x86/kernel/process_64-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/process_64-xen.c      2008-12-01 12:06:01.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/process_64-xen.c   2008-12-01 12:07:15.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/kernel/process_64-xen.c     2008-10-01 16:20:58.000000000 +0200
++++ sle11-2009-05-14/arch/x86/kernel/process_64-xen.c  2008-12-01 12:07:15.000000000 +0100
 @@ -95,7 +95,7 @@ void exit_idle(void)
  }
  
@@ -41,11 +35,9 @@ Index: head-2008-12-01/arch/x86/kernel/process_64-xen.c
  {
        idle_task_exit();
  #ifndef CONFIG_XEN
-Index: head-2008-12-01/arch/x86/kernel/time_32-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/kernel/time_32-xen.c 2008-12-01 11:58:30.000000000 +0100
-+++ head-2008-12-01/arch/x86/kernel/time_32-xen.c      2008-12-01 12:07:15.000000000 +0100
-@@ -704,7 +704,7 @@ int xen_update_persistent_clock(void)
+--- sle11-2009-05-14.orig/arch/x86/kernel/time_32-xen.c        2009-03-24 10:13:50.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/time_32-xen.c     2009-03-24 10:22:14.000000000 +0100
+@@ -702,7 +702,7 @@ int xen_update_persistent_clock(void)
  /* Dynamically-mapped IRQ. */
  DEFINE_PER_CPU(int, timer_irq);
  
@@ -54,7 +46,7 @@ Index: head-2008-12-01/arch/x86/kernel/time_32-xen.c
  {
        per_cpu(timer_irq, 0) =
                bind_virq_to_irqhandler(
-@@ -915,7 +915,7 @@ int __cpuinit local_setup_timer(unsigned
+@@ -913,7 +913,7 @@ int __cpuinit local_setup_timer(unsigned
        return 0;
  }
  
@@ -63,10 +55,8 @@ Index: head-2008-12-01/arch/x86/kernel/time_32-xen.c
  {
        BUG_ON(cpu == 0);
        unbind_from_irqhandler(per_cpu(timer_irq, cpu), NULL);
-Index: head-2008-12-01/arch/x86/mm/ioremap-xen.c
-===================================================================
---- head-2008-12-01.orig/arch/x86/mm/ioremap-xen.c     2008-12-01 12:03:09.000000000 +0100
-+++ head-2008-12-01/arch/x86/mm/ioremap-xen.c  2008-12-01 12:07:15.000000000 +0100
+--- sle11-2009-05-14.orig/arch/x86/mm/ioremap-xen.c    2009-01-16 10:45:51.000000000 +0100
++++ sle11-2009-05-14/arch/x86/mm/ioremap-xen.c 2009-01-07 10:55:24.000000000 +0100
 @@ -201,7 +201,8 @@ int touch_pte_range(struct mm_struct *mm
  
  EXPORT_SYMBOL(touch_pte_range);
@@ -85,10 +75,8 @@ Index: head-2008-12-01/arch/x86/mm/ioremap-xen.c
  
  /*
   * Fix up the linear direct mapping of the kernel to avoid cache attribute
-Index: head-2008-12-01/drivers/xen/core/cpu_hotplug.c
-===================================================================
---- head-2008-12-01.orig/drivers/xen/core/cpu_hotplug.c        2008-01-21 11:15:26.000000000 +0100
-+++ head-2008-12-01/drivers/xen/core/cpu_hotplug.c     2008-12-01 12:07:15.000000000 +0100
+--- sle11-2009-05-14.orig/drivers/xen/core/cpu_hotplug.c       2009-05-14 10:56:29.000000000 +0200
++++ sle11-2009-05-14/drivers/xen/core/cpu_hotplug.c    2008-12-01 12:07:15.000000000 +0100
 @@ -24,7 +24,7 @@ static int local_cpu_hotplug_request(voi
        return (current->mm != NULL);
  }
@@ -150,11 +138,9 @@ Index: head-2008-12-01/drivers/xen/core/cpu_hotplug.c
  {
        unsigned int cpu;
  
-Index: head-2008-12-01/drivers/xen/core/smpboot.c
-===================================================================
---- head-2008-12-01.orig/drivers/xen/core/smpboot.c    2008-12-01 11:49:07.000000000 +0100
-+++ head-2008-12-01/drivers/xen/core/smpboot.c 2008-12-01 12:07:15.000000000 +0100
-@@ -176,7 +176,7 @@ static int __cpuinit xen_smp_intr_init(u
+--- sle11-2009-05-14.orig/drivers/xen/core/smpboot.c   2009-03-16 16:38:16.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/core/smpboot.c        2008-12-01 12:07:15.000000000 +0100
+@@ -168,7 +168,7 @@ static int __cpuinit xen_smp_intr_init(u
  }
  
  #ifdef CONFIG_HOTPLUG_CPU
@@ -163,7 +149,7 @@ Index: head-2008-12-01/drivers/xen/core/smpboot.c
  {
        if (cpu != 0)
                local_teardown_timer(cpu);
-@@ -395,7 +395,7 @@ int __cpuexit __cpu_disable(void)
+@@ -387,7 +387,7 @@ int __cpuexit __cpu_disable(void)
        return 0;
  }