0e9e131edf
25242-x86_64-hotplug-compat-m2p.patch 25247-SVM-no-rdtsc-intercept.patch 25267-x86-text-unlikely.patch 25269-x86-vMCE-addr-misc-write.patch 25271-x86_64-IST-index.patch 25327-pvdrv-no-asm-system-h.patch - Upstream patches from Jan 25168-x86-memset-size.patch 25191-x86-tdt-delta-calculation.patch 25195-x86-cpuidle-C2-no-flush-or-bm-check.patch 25196-x86-HAP-PAT-sr.patch 25200-x86_64-trap-bounce-flags.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=189
40 lines
1.5 KiB
Diff
40 lines
1.5 KiB
Diff
Index: xen-4.1.2-testing/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h
|
|
===================================================================
|
|
--- xen-4.1.2-testing.orig/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h
|
|
+++ xen-4.1.2-testing/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h
|
|
@@ -161,4 +161,14 @@ typedef irqreturn_t (*irq_handler_t)(int
|
|
#define atomic_cmpxchg(v, old, new) (cmpxchg(&((v)->counter), (old), (new)))
|
|
#endif
|
|
|
|
+#ifdef sync_test_bit
|
|
+#define synch_change_bit sync_change_bit
|
|
+#define synch_clear_bit sync_clear_bit
|
|
+#define synch_set_bit sync_set_bit
|
|
+#define synch_test_and_change_bit sync_test_and_change_bit
|
|
+#define synch_test_and_clear_bit sync_test_and_clear_bit
|
|
+#define synch_test_and_set_bit sync_test_and_set_bit
|
|
+#define synch_test_bit sync_test_bit
|
|
+#endif
|
|
+
|
|
#endif
|
|
Index: xen-4.1.2-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
|
|
===================================================================
|
|
--- xen-4.1.2-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
|
|
+++ xen-4.1.2-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
|
|
@@ -122,6 +122,7 @@ unsigned long alloc_xen_mmio(unsigned lo
|
|
|
|
#ifndef __ia64__
|
|
|
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
|
|
static uint32_t xen_cpuid_base(void)
|
|
{
|
|
uint32_t base, eax, ebx, ecx, edx;
|
|
@@ -140,6 +141,7 @@ static uint32_t xen_cpuid_base(void)
|
|
|
|
return 0;
|
|
}
|
|
+#endif
|
|
|
|
static int init_hypercall_stubs(void)
|
|
{
|