aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/block/Kconfig8
-rw-r--r--drivers/block/Makefile1
-rw-r--r--drivers/block/xen-blkback/Makefile (renamed from drivers/xen/blkback/Makefile)0
-rw-r--r--drivers/block/xen-blkback/blkback.c (renamed from drivers/xen/blkback/blkback.c)0
-rw-r--r--drivers/block/xen-blkback/common.h (renamed from drivers/xen/blkback/common.h)0
-rw-r--r--drivers/block/xen-blkback/interface.c (renamed from drivers/xen/blkback/interface.c)0
-rw-r--r--drivers/block/xen-blkback/vbd.c (renamed from drivers/xen/blkback/vbd.c)0
-rw-r--r--drivers/block/xen-blkback/xenbus.c (renamed from drivers/xen/blkback/xenbus.c)0
-rw-r--r--drivers/xen/Kconfig8
-rw-r--r--drivers/xen/Makefile1
10 files changed, 9 insertions, 9 deletions
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 83c32cb72582..9abb64689712 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -470,6 +470,14 @@ config XEN_BLKDEV_FRONTEND
470 block device driver. It communicates with a back-end driver 470 block device driver. It communicates with a back-end driver
471 in another domain which drives the actual block device. 471 in another domain which drives the actual block device.
472 472
473config XEN_BLKDEV_BACKEND
474 tristate "Block-device backend driver"
475 depends on XEN_BACKEND
476 help
477 The block-device backend driver allows the kernel to export its
478 block devices to other guests via a high-performance shared-memory
479 interface.
480
473config VIRTIO_BLK 481config VIRTIO_BLK
474 tristate "Virtio block driver (EXPERIMENTAL)" 482 tristate "Virtio block driver (EXPERIMENTAL)"
475 depends on EXPERIMENTAL && VIRTIO 483 depends on EXPERIMENTAL && VIRTIO
diff --git a/drivers/block/Makefile b/drivers/block/Makefile
index 40528ba56d1b..76646e9a1c91 100644
--- a/drivers/block/Makefile
+++ b/drivers/block/Makefile
@@ -36,6 +36,7 @@ obj-$(CONFIG_BLK_DEV_UB) += ub.o
36obj-$(CONFIG_BLK_DEV_HD) += hd.o 36obj-$(CONFIG_BLK_DEV_HD) += hd.o
37 37
38obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o 38obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o
39obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/
39obj-$(CONFIG_BLK_DEV_DRBD) += drbd/ 40obj-$(CONFIG_BLK_DEV_DRBD) += drbd/
40obj-$(CONFIG_BLK_DEV_RBD) += rbd.o 41obj-$(CONFIG_BLK_DEV_RBD) += rbd.o
41 42
diff --git a/drivers/xen/blkback/Makefile b/drivers/block/xen-blkback/Makefile
index f1ae1ff07a4d..f1ae1ff07a4d 100644
--- a/drivers/xen/blkback/Makefile
+++ b/drivers/block/xen-blkback/Makefile
diff --git a/drivers/xen/blkback/blkback.c b/drivers/block/xen-blkback/blkback.c
index 59a2bae0f35e..59a2bae0f35e 100644
--- a/drivers/xen/blkback/blkback.c
+++ b/drivers/block/xen-blkback/blkback.c
diff --git a/drivers/xen/blkback/common.h b/drivers/block/xen-blkback/common.h
index 6257c1106591..6257c1106591 100644
--- a/drivers/xen/blkback/common.h
+++ b/drivers/block/xen-blkback/common.h
diff --git a/drivers/xen/blkback/interface.c b/drivers/block/xen-blkback/interface.c
index 163aed41e825..163aed41e825 100644
--- a/drivers/xen/blkback/interface.c
+++ b/drivers/block/xen-blkback/interface.c
diff --git a/drivers/xen/blkback/vbd.c b/drivers/block/xen-blkback/vbd.c
index d0ff4cf91a34..d0ff4cf91a34 100644
--- a/drivers/xen/blkback/vbd.c
+++ b/drivers/block/xen-blkback/vbd.c
diff --git a/drivers/xen/blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c
index b41ed65db2d3..b41ed65db2d3 100644
--- a/drivers/xen/blkback/xenbus.c
+++ b/drivers/block/xen-blkback/xenbus.c
diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
index fb1af628cbfc..a59638b37c1a 100644
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@ -37,14 +37,6 @@ config XEN_BACKEND
37 Support for backend device drivers that provide I/O services 37 Support for backend device drivers that provide I/O services
38 to other virtual machines. 38 to other virtual machines.
39 39
40config XEN_BLKDEV_BACKEND
41 tristate "Block-device backend driver"
42 depends on XEN_BACKEND && BLOCK
43 help
44 The block-device backend driver allows the kernel to export its
45 block devices to other guests via a high-performance shared-memory
46 interface.
47
48config XENFS 40config XENFS
49 tristate "Xen filesystem" 41 tristate "Xen filesystem"
50 default y 42 default y
diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile
index 29c0a416f082..f420f1ff7f13 100644
--- a/drivers/xen/Makefile
+++ b/drivers/xen/Makefile
@@ -11,7 +11,6 @@ obj-$(CONFIG_XEN_BALLOON) += xen-balloon.o
11obj-$(CONFIG_XEN_DEV_EVTCHN) += xen-evtchn.o 11obj-$(CONFIG_XEN_DEV_EVTCHN) += xen-evtchn.o
12obj-$(CONFIG_XEN_GNTDEV) += xen-gntdev.o 12obj-$(CONFIG_XEN_GNTDEV) += xen-gntdev.o
13obj-$(CONFIG_XEN_GRANT_DEV_ALLOC) += xen-gntalloc.o 13obj-$(CONFIG_XEN_GRANT_DEV_ALLOC) += xen-gntalloc.o
14obj-$(CONFIG_XEN_BLKDEV_BACKEND) += blkback/
15obj-$(CONFIG_XENFS) += xenfs/ 14obj-$(CONFIG_XENFS) += xenfs/
16obj-$(CONFIG_XEN_SYS_HYPERVISOR) += sys-hypervisor.o 15obj-$(CONFIG_XEN_SYS_HYPERVISOR) += sys-hypervisor.o
17obj-$(CONFIG_XEN_PLATFORM_PCI) += xen-platform-pci.o 16obj-$(CONFIG_XEN_PLATFORM_PCI) += xen-platform-pci.o