From: kfraser@localhost.localdomain <kfraser@localhost.localdomain>
Date: Thu, 17 Aug 2006 15:33:42 +0000 (+0100)
Subject: [HVM] Allow blkfront driver to be built for an HVM guest.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15710^2~58
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=dc043970e7ade1325656d5b738f78ef9d7e86091;p=xen.git

[HVM] Allow blkfront driver to be built for an HVM guest.
Signed-off-by: Steven Smith <ssmith@xensource.com>
---

diff --git a/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c b/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c
index 20e5ad63b8..bee1da5ff5 100644
--- a/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c
+++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c
@@ -46,6 +46,7 @@
 #include <xen/interface/grant_table.h>
 #include <xen/gnttab.h>
 #include <asm/hypervisor.h>
+#include <asm/maddr.h>
 
 #define BLKIF_STATE_DISCONNECTED 0
 #define BLKIF_STATE_CONNECTED    1
diff --git a/unmodified_drivers/linux-2.6/Makefile b/unmodified_drivers/linux-2.6/Makefile
index a7a52f8f9e..dacbc7012f 100644
--- a/unmodified_drivers/linux-2.6/Makefile
+++ b/unmodified_drivers/linux-2.6/Makefile
@@ -2,3 +2,4 @@ include $(M)/overrides.mk
 
 obj-m += platform-pci/
 obj-m += xenbus/
+obj-m += blkfront/
diff --git a/unmodified_drivers/linux-2.6/blkfront/Kbuild b/unmodified_drivers/linux-2.6/blkfront/Kbuild
new file mode 100644
index 0000000000..0a46fb22c3
--- /dev/null
+++ b/unmodified_drivers/linux-2.6/blkfront/Kbuild
@@ -0,0 +1,5 @@
+include $(M)/overrides.mk
+
+obj-m += xen-vbd.o
+
+xen-vbd-objs := blkfront.o vbd.o