---

yaml --- r: 251238 b: refs/heads/master c: dfc07b1 h: refs/heads/master v: v3
git-mirror · Apr 18, 2011 · cbf228c · cbf228c
1 parent 7e408e1
commit cbf228c
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2436eda2e81f1993bfe6349f17f52503bffeff5
+refs/heads/master: dfc07b13dcacefda6ebdea14584ed8724dc980ef
diff --git a/trunk/drivers/block/Kconfig b/trunk/drivers/block/Kconfig
@@ -470,6 +470,14 @@ config XEN_BLKDEV_FRONTEND
 	  block device driver.  It communicates with a back-end driver
 	  in another domain which drives the actual block device.
 
+config XEN_BLKDEV_BACKEND
+	tristate "Block-device backend driver"
+	depends on XEN_BACKEND
+	help
+	  The block-device backend driver allows the kernel to export its
+	  block devices to other guests via a high-performance shared-memory
+	  interface.
+
 config VIRTIO_BLK
 	tristate "Virtio block driver (EXPERIMENTAL)"
 	depends on EXPERIMENTAL && VIRTIO

diff --git a/trunk/drivers/block/Makefile b/trunk/drivers/block/Makefile
@@ -36,6 +36,7 @@ obj-$(CONFIG_BLK_DEV_UB)	+= ub.o
 obj-$(CONFIG_BLK_DEV_HD)	+= hd.o
 
 obj-$(CONFIG_XEN_BLKDEV_FRONTEND)	+= xen-blkfront.o
+obj-$(CONFIG_XEN_BLKDEV_BACKEND)	+= xen-blkback/
 obj-$(CONFIG_BLK_DEV_DRBD)     += drbd/
 obj-$(CONFIG_BLK_DEV_RBD)     += rbd.o
 

diff --git a/trunk/drivers/xen/blkback/Makefile → trunk/drivers/block/xen-blkback/Makefile b/trunk/drivers/xen/blkback/Makefile → trunk/drivers/block/xen-blkback/Makefile
diff --git a/trunk/drivers/xen/blkback/blkback.c → trunk/drivers/block/xen-blkback/blkback.c b/trunk/drivers/xen/blkback/blkback.c → trunk/drivers/block/xen-blkback/blkback.c
diff --git a/trunk/drivers/xen/blkback/common.h → trunk/drivers/block/xen-blkback/common.h b/trunk/drivers/xen/blkback/common.h → trunk/drivers/block/xen-blkback/common.h
diff --git a/trunk/drivers/xen/blkback/interface.c → trunk/drivers/block/xen-blkback/interface.c b/trunk/drivers/xen/blkback/interface.c → trunk/drivers/block/xen-blkback/interface.c
diff --git a/trunk/drivers/xen/blkback/vbd.c → trunk/drivers/block/xen-blkback/vbd.c b/trunk/drivers/xen/blkback/vbd.c → trunk/drivers/block/xen-blkback/vbd.c
diff --git a/trunk/drivers/xen/blkback/xenbus.c → trunk/drivers/block/xen-blkback/xenbus.c b/trunk/drivers/xen/blkback/xenbus.c → trunk/drivers/block/xen-blkback/xenbus.c
diff --git a/trunk/drivers/xen/Kconfig b/trunk/drivers/xen/Kconfig
@@ -37,14 +37,6 @@ config XEN_BACKEND
 	  Support for backend device drivers that provide I/O services
 	  to other virtual machines.
 
-config XEN_BLKDEV_BACKEND
-	tristate "Block-device backend driver"
-	depends on XEN_BACKEND && BLOCK
-	help
-	  The block-device backend driver allows the kernel to export its
-	  block devices to other guests via a high-performance shared-memory
-	  interface.
-
 config XENFS
 	tristate "Xen filesystem"
 	default y

diff --git a/trunk/drivers/xen/Makefile b/trunk/drivers/xen/Makefile
@@ -11,7 +11,6 @@ obj-$(CONFIG_XEN_BALLOON)	+= xen-balloon.o
 obj-$(CONFIG_XEN_DEV_EVTCHN)	+= xen-evtchn.o
 obj-$(CONFIG_XEN_GNTDEV)	+= xen-gntdev.o
 obj-$(CONFIG_XEN_GRANT_DEV_ALLOC)	+= xen-gntalloc.o
-obj-$(CONFIG_XEN_BLKDEV_BACKEND)	+= blkback/
 obj-$(CONFIG_XENFS)		+= xenfs/
 obj-$(CONFIG_XEN_SYS_HYPERVISOR)	+= sys-hypervisor.o
 obj-$(CONFIG_XEN_PLATFORM_PCI)	+= xen-platform-pci.o