Updated xen patches taken from suse.

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

diff --git a/src/patches/60016_xen3-fixup-xen.patch1 b/src/patches/suse-2.6.27.25/patches.xen/xen3-fixup-xen
similarity index 99%
rename from src/patches/60016_xen3-fixup-xen.patch1
rename to src/patches/suse-2.6.27.25/patches.xen/xen3-fixup-xen
index bf1044769c11c93f80592dafcc180508e3b0b559..2781775540f125ba14e895b42a18905f8398bafd 100644 (file)
--- a/src/patches/60016_xen3-fixup-xen.patch1
+++ b/src/patches/suse-2.6.27.25/patches.xen/xen3-fixup-xen
@@ -4787,17 +4787,16 @@ Index: head-2008-11-25/include/xen/interface/xen.h
  #define __HYPERVISOR_grant_table_op       20
  #define __HYPERVISOR_vm_assist            21
  #define __HYPERVISOR_update_va_mapping_otherdomain 22
-@@ -50,14 +83,17 @@
+@@ -50,7 +83,7 @@
  #define __HYPERVISOR_vcpu_op              24
  #define __HYPERVISOR_set_segment_base     25 /* x86/64 only */
  #define __HYPERVISOR_mmuext_op            26
 -#define __HYPERVISOR_acm_op               27
 +#define __HYPERVISOR_xsm_op               27
  #define __HYPERVISOR_nmi_op               28
--#define __HYPERVISOR_sched_op_new         29
-+#define __HYPERVISOR_sched_op             29
+ #define __HYPERVISOR_sched_op_new         29
  #define __HYPERVISOR_callback_op          30
- #define __HYPERVISOR_xenoprof_op          31
+@@ -58,6 +91,9 @@
  #define __HYPERVISOR_event_channel_op     32
  #define __HYPERVISOR_physdev_op           33
  #define __HYPERVISOR_hvm_op               34
@@ -4807,7 +4806,7 @@ Index: head-2008-11-25/include/xen/interface/xen.h
  
  /* Architecture-specific hypercall definitions. */
  #define __HYPERVISOR_arch_0               48
-@@ -70,15 +106,46 @@
+@@ -70,15 +106,48 @@
  #define __HYPERVISOR_arch_7               55
  
  /*
@@ -4818,6 +4817,8 @@ Index: head-2008-11-25/include/xen/interface/xen.h
 +#if __XEN_INTERFACE_VERSION__ < 0x00030101
 +#undef __HYPERVISOR_sched_op
 +#define __HYPERVISOR_sched_op __HYPERVISOR_sched_op_compat
++#else
++#define __HYPERVISOR_sched_op __HYPERVISOR_sched_op_new
 +#endif
 +
 +/* New event-channel and physdev hypercalls introduced in 0x00030202. */