2012-03-13 17:17:31 +00:00
|
|
|
--- 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
|
2011-09-15 21:43:21 +00:00
|
|
|
--- 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
|
2011-03-21 16:47:37 +00:00
|
|
|
@@ -123,6 +123,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;
|
|
|
|
|
@@ -141,6 +142,7 @@ static uint32_t xen_cpuid_base(void)
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
+#endif
|
|
|
|
|
|
|
|
|
|
static int init_hypercall_stubs(void)
|
|
|
|
|
{
|
2012-05-14 05:45:42 +00:00
|
|
|
--- 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
|
|
|
|
|
@@ -30,7 +30,6 @@
|
|
|
|
|
#include <linux/interrupt.h>
|
|
|
|
|
#include <linux/vmalloc.h>
|
|
|
|
|
#include <linux/mm.h>
|
|
|
|
|
-#include <asm/system.h>
|
|
|
|
|
#include <asm/io.h>
|
|
|
|
|
#include <asm/irq.h>
|
|
|
|
|
#include <asm/uaccess.h>
|
