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-x86-vmware-tsc-03-detect-from-hypervisor

diff --git a/src/patches/suse-2.6.27.31/patches.xen/xen3-x86-vmware-tsc-03-detect-from-hypervisor b/src/patches/suse-2.6.27.39/patches.xen/xen3-x86-vmware-tsc-03-detect-from-hypervisor
similarity index 80%
rename from src/patches/suse-2.6.27.31/patches.xen/xen3-x86-vmware-tsc-03-detect-from-hypervisor
rename to src/patches/suse-2.6.27.39/patches.xen/xen3-x86-vmware-tsc-03-detect-from-hypervisor
index dcd8549830c1ca42436a3bba3271ad6b571f1001..85e3b184de227819d42c6f06a7cc7b7ff3d19881 100644 (file)
--- a/src/patches/suse-2.6.27.31/patches.xen/xen3-x86-vmware-tsc-03-detect-from-hypervisor
+++ b/src/patches/suse-2.6.27.39/patches.xen/xen3-x86-vmware-tsc-03-detect-from-hypervisor
@@ -37,16 +37,16 @@ Signed-off-by: Takashi Iwai <tiwai@suse.de>
 
 Automatically created from "patches.arch/x86-vmware-tsc-03-detect-from-hypervisor" by xen-port-patches.py
 
---- sle11-2009-07-31.orig/arch/x86/kernel/cpu/Makefile 2009-07-31 14:49:20.000000000 +0200
-+++ sle11-2009-07-31/arch/x86/kernel/cpu/Makefile      2009-02-16 17:03:24.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/cpu/Makefile 2009-10-16 14:48:15.000000000 +0200
++++ sle11-2009-10-16/arch/x86/kernel/cpu/Makefile      2009-02-16 17:03:24.000000000 +0100
 @@ -23,3 +23,5 @@ obj-$(CONFIG_MTRR)   += mtrr/
  obj-$(CONFIG_CPU_FREQ)        += cpufreq/
  
  obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o
 +
 +disabled-obj-$(CONFIG_XEN) := hypervisor.o vmware.o
---- sle11-2009-07-31.orig/arch/x86/kernel/cpu/common-xen.c     2009-06-04 10:21:39.000000000 +0200
-+++ sle11-2009-07-31/arch/x86/kernel/cpu/common-xen.c  2009-02-16 17:03:24.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/cpu/common-xen.c     2009-06-04 10:21:39.000000000 +0200
++++ sle11-2009-10-16/arch/x86/kernel/cpu/common-xen.c  2009-02-16 17:03:24.000000000 +0100
 @@ -14,6 +14,7 @@
  #include <asm/mce.h>
  #include <asm/pat.h>
@@ -63,8 +63,8 @@ Automatically created from "patches.arch/x86-vmware-tsc-03-detect-from-hyperviso
        /*
         * On SMP, boot_cpu_data holds the common feature set between
         * all CPUs; so make sure that we indicate which features are
---- sle11-2009-07-31.orig/arch/x86/kernel/cpu/common_64-xen.c  2009-06-04 10:21:39.000000000 +0200
-+++ sle11-2009-07-31/arch/x86/kernel/cpu/common_64-xen.c       2009-02-16 17:03:24.000000000 +0100
+--- sle11-2009-10-16.orig/arch/x86/kernel/cpu/common_64-xen.c  2009-06-04 10:21:39.000000000 +0200
++++ sle11-2009-10-16/arch/x86/kernel/cpu/common_64-xen.c       2009-02-16 17:03:24.000000000 +0100
 @@ -36,6 +36,7 @@
  #include <asm/sections.h>
  #include <asm/setup.h>
@@ -81,8 +81,8 @@ Automatically created from "patches.arch/x86-vmware-tsc-03-detect-from-hyperviso
        /*
         * On SMP, boot_cpu_data holds the common feature set between
         * all CPUs; so make sure that we indicate which features are
---- sle11-2009-07-31.orig/arch/x86/kernel/setup-xen.c  2009-07-31 15:08:11.000000000 +0200
-+++ sle11-2009-07-31/arch/x86/kernel/setup-xen.c       2009-07-31 15:13:15.000000000 +0200
+--- sle11-2009-10-16.orig/arch/x86/kernel/setup-xen.c  2009-07-31 15:08:11.000000000 +0200
++++ sle11-2009-10-16/arch/x86/kernel/setup-xen.c       2009-10-16 14:59:35.000000000 +0200
 @@ -98,6 +98,7 @@
  
  #include <mach_apic.h>
@@ -102,10 +102,10 @@ Automatically created from "patches.arch/x86-vmware-tsc-03-detect-from-hyperviso
 +      init_hypervisor(&boot_cpu_data);
 +
  #ifdef CONFIG_X86_32
-       request_resource(&iomem_resource, &video_ram_resource);
- #endif
---- sle11-2009-07-31.orig/include/asm-x86/hypervisor.h 2009-07-31 14:49:20.000000000 +0200
-+++ sle11-2009-07-31/include/asm-x86/hypervisor.h      2009-02-16 17:03:24.000000000 +0100
+       if (is_initial_xendomain())
+               request_resource(&iomem_resource, &video_ram_resource);
+--- sle11-2009-10-16.orig/include/asm-x86/hypervisor.h 2009-10-16 14:48:15.000000000 +0200
++++ sle11-2009-10-16/include/asm-x86/hypervisor.h      2009-02-16 17:03:24.000000000 +0100
 @@ -24,3 +24,7 @@ extern unsigned long get_hypervisor_tsc_
  extern void init_hypervisor(struct cpuinfo_x86 *c);
  
@@ -114,8 +114,8 @@ Automatically created from "patches.arch/x86-vmware-tsc-03-detect-from-hyperviso
 +#ifdef HAVE_XEN_PLATFORM_COMPAT_H
 +#include_next <asm/hypervisor.h>
 +#endif
---- sle11-2009-07-31.orig/include/asm-x86/mach-xen/asm/hypervisor.h    2009-03-16 16:17:45.000000000 +0100
-+++ sle11-2009-07-31/include/asm-x86/mach-xen/asm/hypervisor.h 2009-03-12 16:42:09.000000000 +0100
+--- sle11-2009-10-16.orig/include/asm-x86/mach-xen/asm/hypervisor.h    2009-03-16 16:17:45.000000000 +0100
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/hypervisor.h 2009-03-12 16:42:09.000000000 +0100
 @@ -67,6 +67,8 @@ extern start_info_t *xen_start_info;
  #define is_initial_xendomain() 0
  #endif
@@ -125,8 +125,8 @@ Automatically created from "patches.arch/x86-vmware-tsc-03-detect-from-hyperviso
  /* arch/xen/kernel/evtchn.c */
  /* Force a proper event-channel callback from Xen. */
  void force_evtchn_callback(void);
---- sle11-2009-07-31.orig/include/asm-x86/mach-xen/asm/processor.h     2009-07-31 00:00:00.000000000 +0200
-+++ sle11-2009-07-31/include/asm-x86/mach-xen/asm/processor.h  2009-02-16 17:03:24.000000000 +0100
+--- sle11-2009-10-16.orig/include/asm-x86/mach-xen/asm/processor.h     2009-10-16 00:00:00.000000000 +0200
++++ sle11-2009-10-16/include/asm-x86/mach-xen/asm/processor.h  2009-02-16 17:03:24.000000000 +0100
 @@ -110,6 +110,7 @@ struct cpuinfo_x86 {
        /* Index into per_cpu list: */
        u16                     cpu_index;