Imported linux-2.6.27.39 suse/xen patches.

[people/teissler/ipfire-2.x.git] / src / patches / suse-2.6.27.39 / patches.xen / xen3-fixup-arch-x86

diff --git a/src/patches/suse-2.6.27.31/patches.xen/xen3-fixup-arch-x86 b/src/patches/suse-2.6.27.39/patches.xen/xen3-fixup-arch-x86
similarity index 53%
rename from src/patches/suse-2.6.27.31/patches.xen/xen3-fixup-arch-x86
rename to src/patches/suse-2.6.27.39/patches.xen/xen3-fixup-arch-x86
index 7a09fb1d458c5a9a23935bd2d0ed5d54133e41e5..c0f89a33e98f02ef78edb7e29b31e99387548889 100644 (file)
--- a/src/patches/suse-2.6.27.31/patches.xen/xen3-fixup-arch-x86
+++ b/src/patches/suse-2.6.27.39/patches.xen/xen3-fixup-arch-x86
@@ -2,8 +2,8 @@ Subject: xen3 x86 build fixes.
 From: jbeulich@novell.com
 Patch-mainline: obsolete
 
---- sle11-2009-06-04.orig/arch/x86/kdb/kdba_bt.c       2009-06-04 10:17:50.000000000 +0200
-+++ sle11-2009-06-04/arch/x86/kdb/kdba_bt.c    2009-06-04 10:19:52.000000000 +0200
+--- sle11-2009-10-16.orig/arch/x86/kdb/kdba_bt.c       2009-10-16 14:48:16.000000000 +0200
++++ sle11-2009-10-16/arch/x86/kdb/kdba_bt.c    2009-06-04 10:19:52.000000000 +0200
 @@ -3196,6 +3196,9 @@ bb_usage_mov(const struct bb_operand *sr
            bb_is_int_reg(dst->base_rc) &&
            full_register_dst) {
@@ -14,15 +14,26 @@ Patch-mainline: obsolete
                /* mov from TSS_sysenter_sp0+offset to esp to fix up the
                 * sysenter stack, it leaves esp well defined.  mov
                 * TSS_ysenter_sp0+offset(%esp),%esp is followed by up to 5
---- sle11-2009-06-04.orig/arch/x86/power/Makefile      2009-06-04 10:17:50.000000000 +0200
-+++ sle11-2009-06-04/arch/x86/power/Makefile   2009-06-04 10:19:52.000000000 +0200
+--- sle11-2009-10-16.orig/arch/x86/kernel/cpu/intel_cacheinfo.c        2008-10-10 00:13:53.000000000 +0200
++++ sle11-2009-10-16/arch/x86/kernel/cpu/intel_cacheinfo.c     2009-10-16 14:50:37.000000000 +0200
+@@ -455,7 +455,7 @@ unsigned int __cpuinit init_intel_cachei
+ static DEFINE_PER_CPU(struct _cpuid4_info *, cpuid4_info);
+ #define CPUID4_INFO_IDX(x, y)    (&((per_cpu(cpuid4_info, x))[y]))
+ 
+-#ifdef CONFIG_SMP
++#if defined(CONFIG_SMP) && !defined(CONFIG_XEN)
+ static void __cpuinit cache_shared_cpu_map_setup(unsigned int cpu, int index)
+ {
+       struct _cpuid4_info     *this_leaf, *sibling_leaf;
+--- sle11-2009-10-16.orig/arch/x86/power/Makefile      2009-10-16 14:48:16.000000000 +0200
++++ sle11-2009-10-16/arch/x86/power/Makefile   2009-06-04 10:19:52.000000000 +0200
 @@ -1,2 +1,4 @@
  obj-$(CONFIG_PM_SLEEP)                += cpu_$(BITS).o
  obj-$(CONFIG_HIBERNATION)     += hibernate_$(BITS).o hibernate_asm_$(BITS).o
 +
 +disabled-obj-$(CONFIG_XEN)    := cpu_$(BITS).o
---- sle11-2009-06-04.orig/arch/x86/power/cpu_64.c      2009-06-04 10:18:37.000000000 +0200
-+++ sle11-2009-06-04/arch/x86/power/cpu_64.c   2009-06-04 10:19:52.000000000 +0200
+--- sle11-2009-10-16.orig/arch/x86/power/cpu_64.c      2008-11-25 12:35:54.000000000 +0100
++++ sle11-2009-10-16/arch/x86/power/cpu_64.c   2009-06-04 10:19:52.000000000 +0200
 @@ -135,7 +135,6 @@ void restore_processor_state(void)
  
  static void fix_processor_context(void)