File pvdrv-blkfront-build-upstream.patch of Package xen.4218

References: bsc#957986

--- a/unmodified_drivers/linux-2.6/Makefile
+++ b/unmodified_drivers/linux-2.6/Makefile
@@ -3,6 +3,7 @@ include $(M)/overrides.mk
 obj-m += platform-pci/
 obj-m += balloon/
 obj-m += blkfront/
+obj-m += blkfront-new/
 obj-m += netfront/
 obj-m += scsifront/
 obj-m += usbfront/
--- a/unmodified_drivers/linux-2.6/Module.supported
+++ b/unmodified_drivers/linux-2.6/Module.supported
@@ -1,4 +1,5 @@
 xen-vbd
+xen-vbd-upstream
 xen-platform-pci
 xen-vnif
 xenbus
--- /dev/null
+++ b/unmodified_drivers/linux-2.6/blkfront-new/Kbuild
@@ -0,0 +1,7 @@
+include $(M)/overrides.mk
+
+ifneq ($(wildcard $(obj)/*.c),)
+obj-m += xen-vbd-upstream.o
+endif
+
+xen-vbd-upstream-objs := xen-blkfront.o
--- /dev/null
+++ b/unmodified_drivers/linux-2.6/blkfront-new/Makefile
@@ -0,0 +1,3 @@
+ifneq ($(KERNELRELEASE),)
+include $(src)/Kbuild
+endif
--- a/unmodified_drivers/linux-2.6/mkbuildtree
+++ b/unmodified_drivers/linux-2.6/mkbuildtree
@@ -31,6 +31,9 @@ for d in $(find ${XL}/drivers/xen/ -mind
     test -d $(basename $d) || continue
     lndir $d $(basename $d) > /dev/null 2>&1
 done
+if [ -s ${XL}/drivers/block/xen-blkfront.c ]; then
+    ln -sf ${XL}/drivers/block/xen-blkfront.c blkfront-new/
+fi
 
 ln -sf ${XL}/drivers/xen/core/gnttab.c platform-pci
 if [ -f ${XL}/drivers/xen/core/features.c ]; then