From d220be6646f23a97d5fd78d5e7932cbc86175d9948db68ad2601fa7ca71c43c5 Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Tue, 13 Mar 2012 17:17:31 +0000 Subject: [PATCH] xen/pv-driver-build.patch: Add compatibility defines for synch_...() bit-ops. OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=173 --- pv-driver-build.patch | 21 +++++++++++++++++---- xen.spec | 1 + 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/pv-driver-build.patch b/pv-driver-build.patch index d7cb463..f692512 100644 --- a/pv-driver-build.patch +++ b/pv-driver-build.patch @@ -1,5 +1,3 @@ -Index: xen-4.1.2-testing/unmodified_drivers/linux-2.6/blkfront/Kbuild -=================================================================== --- xen-4.1.2-testing.orig/unmodified_drivers/linux-2.6/blkfront/Kbuild +++ xen-4.1.2-testing/unmodified_drivers/linux-2.6/blkfront/Kbuild @@ -3,3 +3,4 @@ include $(M)/overrides.mk @@ -7,8 +5,23 @@ Index: xen-4.1.2-testing/unmodified_drivers/linux-2.6/blkfront/Kbuild xen-vbd-objs := blkfront.o vbd.o +xen-vbd-objs += $(patsubst %.c,%.o,$(notdir $(wildcard $(src)/vcd.c))) -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/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 --- 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 @@ -123,6 +123,7 @@ unsigned long alloc_xen_mmio(unsigned lo diff --git a/xen.spec b/xen.spec index 7bcdb3a..a52e0ff 100644 --- a/xen.spec +++ b/xen.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: xen ExclusiveArch: %ix86 x86_64 %define xvers 4.1