This commit is contained in:
committed by
Git OBS Bridge
parent
be29349429
commit
cf62e5ae4d
@@ -1,60 +1,46 @@
|
||||
Index: xen-3.1-testing/unmodified_drivers/linux-2.6/mkbuildtree
|
||||
Index: xen-3.2-testing/unmodified_drivers/linux-2.6/mkbuildtree
|
||||
===================================================================
|
||||
--- xen-3.1-testing.orig/unmodified_drivers/linux-2.6/mkbuildtree
|
||||
+++ xen-3.1-testing/unmodified_drivers/linux-2.6/mkbuildtree
|
||||
@@ -11,7 +11,12 @@ fi
|
||||
C=$PWD
|
||||
--- xen-3.2-testing.orig/unmodified_drivers/linux-2.6/mkbuildtree
|
||||
+++ xen-3.2-testing/unmodified_drivers/linux-2.6/mkbuildtree
|
||||
@@ -13,16 +13,30 @@ C=$PWD
|
||||
if [ -n "$XEN" -a -d "$XEN" ]; then
|
||||
XEN=$(cd $XEN && pwd)
|
||||
else
|
||||
- XEN=$C/../../xen
|
||||
+ XEN=/usr/src/linux/include/xen
|
||||
fi
|
||||
|
||||
XEN=$C/../../xen
|
||||
-XL=$C/../../linux-2.6-xen-sparse
|
||||
+if [ -n "$XL" -a -d "$XL" ]; then
|
||||
+ XL=$(cd $XL && pwd)
|
||||
+else
|
||||
+ XL=/usr/src/linux
|
||||
if [ -n "$XL" -a -d "$XL" ]; then
|
||||
XL=$(cd $XL && pwd)
|
||||
else
|
||||
- XL=$C/../../linux-2.6.18-xen.hg
|
||||
+ XL=/usr/src/linux
|
||||
+fi
|
||||
+cd "$(dirname "$0")"
|
||||
+
|
||||
+if [ -n "$ALT_KMP_OS" -a "$ALT_KMP_OS" == sles10sp1 ]; then
|
||||
+ XL=$C/linux-2.6-xen-sparse
|
||||
+ XEN=$C/linux-2.6-xen-sparse/include/xen
|
||||
fi
|
||||
|
||||
for d in $(find ${XL}/drivers/xen/ -maxdepth 1 -type d | sed -e 1d); do
|
||||
+ # TEMPORARY - Don't link entire directory until the accel.c fix is in the kernel cvs
|
||||
+ if echo $d | egrep -q netfront; then
|
||||
+ ln -sf ${XL}/drivers/xen/netfront/netfront.c netfront
|
||||
+ ln -sf ${XL}/drivers/xen/netfront/netfront.h netfront
|
||||
+ cp -p ../../linux-2.6-xen-sparse/drivers/xen/netfront/accel.c netfront
|
||||
+ continue
|
||||
+ fi
|
||||
+ # END TEMPORARY
|
||||
if ! echo $d | egrep -q back; then
|
||||
Index: xen-3.1-testing/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h
|
||||
===================================================================
|
||||
--- xen-3.1-testing.orig/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h
|
||||
+++ xen-3.1-testing/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h
|
||||
@@ -107,4 +107,12 @@ extern char *kasprintf(gfp_t gfp, const
|
||||
#define __supported_pte_mask ((maddr_t)0)
|
||||
#endif
|
||||
lndir $d $(basename $d) > /dev/null 2>&1
|
||||
fi
|
||||
@@ -39,7 +53,7 @@ ln -sf ${XL}/drivers/xen/core/reboot.c p
|
||||
mkdir -p include/asm include/xen
|
||||
|
||||
+/*
|
||||
+ * This variable at present is referenced by netfront, but only in code that
|
||||
+ * is dead when running in hvm guests. To detect potential active uses of it
|
||||
+ * in the future, don't try to supply a 'valid' value here, so that any
|
||||
+ * mappings created with it will fault when accessed.
|
||||
+ */
|
||||
+#define __supported_pte_mask ((maddr_t)0)
|
||||
+
|
||||
#endif
|
||||
Index: xen-3.1-testing/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c
|
||||
===================================================================
|
||||
--- xen-3.1-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c
|
||||
+++ xen-3.1-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
|
||||
lndir -silent ${XL}/include/xen include/xen
|
||||
-ln -nsf ${XEN}/include/public include/xen/interface
|
||||
+ln -nsf ${XEN}/interface include/xen/interface
|
||||
|
||||
-#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, ...)
|
||||
{
|
||||
Index: xen-3.1-testing/unmodified_drivers/linux-2.6/overrides.mk
|
||||
===================================================================
|
||||
--- xen-3.1-testing.orig/unmodified_drivers/linux-2.6/overrides.mk
|
||||
+++ xen-3.1-testing/unmodified_drivers/linux-2.6/overrides.mk
|
||||
@@ -11,4 +11,4 @@ ifeq ($(ARCH),ia64)
|
||||
EXTRA_CFLAGS += -DCONFIG_VMX_GUEST
|
||||
endif
|
||||
|
||||
-EXTRA_CFLAGS += -include $(srctree)/include/linux/autoconf.h
|
||||
+#EXTRA_CFLAGS += -include $(srctree)/include/linux/autoconf.h
|
||||
# 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
|
||||
|
Reference in New Issue
Block a user