42 lines
1.9 KiB
Diff
42 lines
1.9 KiB
Diff
Index: xen-3.2-testing/unmodified_drivers/linux-2.6/mkbuildtree
|
|
===================================================================
|
|
--- xen-3.2-testing.orig/unmodified_drivers/linux-2.6/mkbuildtree
|
|
+++ xen-3.2-testing/unmodified_drivers/linux-2.6/mkbuildtree
|
|
@@ -40,7 +40,7 @@ ln -sf ${XL}/drivers/xen/core/reboot.c p
|
|
mkdir -p include/asm include/xen
|
|
|
|
lndir -silent ${XL}/include/xen include/xen
|
|
-ln -nsf ${XEN}/include/public include/xen/interface
|
|
+ln -nsf ${XEN}/interface include/xen/interface
|
|
|
|
# Need to be quite careful here: we don't want the files we link in to
|
|
# risk overriding the native Linux ones (in particular, system.h must
|
|
Index: xen-3.2-testing/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h
|
|
===================================================================
|
|
--- xen-3.2-testing.orig/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h
|
|
+++ xen-3.2-testing/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h
|
|
@@ -151,7 +151,7 @@ typedef irqreturn_t (*irq_handler_t)(int
|
|
#endif
|
|
#endif
|
|
|
|
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23)
|
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) && CONFIG_SLE_VERSION < 10
|
|
#define setup_xen_features xen_setup_features
|
|
#endif
|
|
|
|
Index: xen-3.2-testing/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c
|
|
===================================================================
|
|
--- xen-3.2-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c
|
|
+++ xen-3.2-testing/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c
|
|
@@ -119,7 +119,9 @@ void *kzalloc(size_t size, int flags)
|
|
EXPORT_SYMBOL(kzalloc);
|
|
#endif
|
|
|
|
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
|
|
+#if defined(CONFIG_SUSE_KERNEL) \
|
|
+ ? LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16) \
|
|
+ : LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
|
|
/* Simplified asprintf. */
|
|
char *kasprintf(gfp_t gfp, const char *fmt, ...)
|
|
{
|