nuke merged xen patch blkfront-protocol.patch

see 3e334239d89d4a71610be5a3e8432464d421d9ec

svn path=/dists/trunk/linux-2.6/; revision=11460

debian/patches/features/all/xen/blkfront-protocol.patch

@@ -1,78 +0,0 @@
-From 6007e6d44bea69bc39ddb3a45185a1b4f3d42f06 Mon Sep 17 00:00:00 2001
-From: Markus Armbruster <armbru@redhat.com>
-Date: Mon, 25 Feb 2008 14:02:24 +0100
-Subject: [PATCH] xen: Make xen-blkfront write its protocol ABI to xenstore
-
-Frontends are expected to write their protocol ABI to xenstore.  Since
-the protocol ABI defaults to the backend's native ABI, things work
-fine without that as long as the frontend's native ABI is identical to
-the backend's native ABI.  This is not the case for xen-blkfront
-running 32-on-64, because its ABI differs between 32 and 64 bit, and
-thus needs this fix.
-
-Based on http://xenbits.xensource.com/xen-unstable.hg?rev/c545932a18f3
-and http://xenbits.xensource.com/xen-unstable.hg?rev/ffe52263b430 by
-Gerd Hoffmann <kraxel@suse.de>
-
-Signed-off-by: Markus Armbruster <armbru@redhat.com>
----
- drivers/block/xen-blkfront.c         |    7 +++++++
- include/xen/interface/io/protocols.h |   21 +++++++++++++++++++++
- 2 files changed, 28 insertions(+), 0 deletions(-)
- create mode 100644 include/xen/interface/io/protocols.h
-
-diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
-index 9c6f3f9..2e7c81e 100644
---- a/drivers/block/xen-blkfront.c
-+++ b/drivers/block/xen-blkfront.c
-@@ -47,6 +47,7 @@
- 
- #include <xen/interface/grant_table.h>
- #include <xen/interface/io/blkif.h>
-+#include <xen/interface/io/protocols.h>
- 
- #include <asm/xen/hypervisor.h>
- 
-@@ -614,6 +615,12 @@ again:
- 		message = "writing event-channel";
- 		goto abort_transaction;
- 	}
-+	err = xenbus_printf(xbt, dev->nodename, "protocol", "%s",
-+			    XEN_IO_PROTO_ABI_NATIVE);
-+	if (err) {
-+		message = "writing protocol";
-+		goto abort_transaction;
-+	}
- 
- 	err = xenbus_transaction_end(xbt, 0);
- 	if (err) {
-diff --git a/include/xen/interface/io/protocols.h b/include/xen/interface/io/protocols.h
-new file mode 100644
-index 0000000..01fc8ae
---- /dev/null
-+++ b/include/xen/interface/io/protocols.h
-@@ -0,0 +1,21 @@
-+#ifndef __XEN_PROTOCOLS_H__
-+#define __XEN_PROTOCOLS_H__
-+
-+#define XEN_IO_PROTO_ABI_X86_32     "x86_32-abi"
-+#define XEN_IO_PROTO_ABI_X86_64     "x86_64-abi"
-+#define XEN_IO_PROTO_ABI_IA64       "ia64-abi"
-+#define XEN_IO_PROTO_ABI_POWERPC64  "powerpc64-abi"
-+
-+#if defined(__i386__)
-+# define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_X86_32
-+#elif defined(__x86_64__)
-+# define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_X86_64
-+#elif defined(__ia64__)
-+# define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_IA64
-+#elif defined(__powerpc64__)
-+# define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_POWERPC64
-+#else
-+# error arch fixup needed here
-+#endif
-+
-+#endif
--- 
-1.5.4.1
-

debian/patches/series/1~experimental.1-extra

@@ -2,7 +2,6 @@
 + features/all/vserver/bindmount-dev.patch featureset=vserver featureset=xen-vserver
 
 #+ features/all/xen/vmlinuz-target.patch featureset=xen
-#+ features/all/xen/blkfront-protocol.patch featureset=xen
 #+ features/all/xen/xenctrl.patch featureset=xen
 #+ features/all/xen/xenctrl-capabilities.patch featureset=xen
 #+ features/all/xen/xenctrl-privcmd.patch featureset=xen