Try again with xen patches from xen/next-2.6.37

config-x86-generic

@@ -373,6 +373,7 @@ CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_PCIDEV_FRONTEND=m
 CONFIG_XENFS=m
 CONFIG_XEN_COMPAT_XENFS=y
+CONFIG_XEN_GNTDEV=m
 
 CONFIG_MTD_ESB2ROM=m
 CONFIG_MTD_CK804XROM=m

config-x86_64-generic

@@ -304,6 +304,7 @@ CONFIG_XENFS=m
 CONFIG_XEN_COMPAT_XENFS=y
 CONFIG_XEN_DEV_EVTCHN=m
 CONFIG_XEN_SYS_HYPERVISOR=y
+CONFIG_XEN_GNTDEV=m
 
 CONFIG_DMADEVICES=y
 CONFIG_INTEL_IOATDMA=m

kernel.spec

@@ -85,7 +85,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 1
 # The git snapshot level
-%define gitrev 7
+%define gitrev 8
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1302,9 +1302,9 @@ ApplyPatch dmar-disable-when-ricoh-multifunction.patch
 
 # Xen patches
 ApplyPatch xen.next-2.6.37.patch
-ApplyPatch xen.upstream.core.patch
-ApplyPatch xen.pcifront.fixes.patch
-ApplyPatch xen.pvhvm.fixes.patch
+#ApplyPatch xen.upstream.core.patch
+#ApplyPatch xen.pcifront.fixes.patch
+#ApplyPatch xen.pvhvm.fixes.patch
 
 # END OF PATCH APPLICATIONS
 
@@ -1918,6 +1918,10 @@ fi
 #                 ||     ||
 
 %changelog
+* Fri Nov 12 2010 Michael Young <m.a.young@durham.ac.uk>
+- Try again with xen patches from xen/next-2.6.37
+- Build new XEN_GNTDEV option as a module
+
 * Thu Nov 11 2010 Michael Young <m.a.young@durham.ac.uk>
 - experiment with patch format by adding various xen bugfixes