xen: make gntdev code configurable

Signed-off-by: Jan Beulich <jbeulich@novell.com>

diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
index a6c78b01cdfaa2988aeb0d7ec8be0745344b9323..efb69e1309fe56e56d5c93a7ca7f298ed4950c8a 100644 (file)
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@ -187,6 +187,13 @@ config XEN_NETDEV_FRONTEND
          dedicated device-driver domain, or your master control domain
          (domain 0), then you almost certainly want to say Y here.
 
+config XEN_GRANT_DEV
+       tristate "User-space granted page access driver"
+       default XEN_PRIVILEGED_GUEST
+       help
+         Device for accessing (in user-space) pages that have been granted
+         by other domains.
+
 config XEN_FRAMEBUFFER
        tristate "Framebuffer-device frontend driver"
        depends on XEN && FB

diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile
index 015dd39ffcef6148665f10a877e4d125f173d687..85a16f4f02331134507c8d4d1623861037b9925b 100644 (file)
--- a/drivers/xen/Makefile
+++ b/drivers/xen/Makefile
@@ -2,7 +2,6 @@ obj-y   += core/
 obj-y  += console/
 obj-y  += evtchn/
 obj-y  += xenbus/
-obj-y  += gntdev/
 obj-y  += char/
 
 obj-y  += util.o
@@ -18,3 +17,4 @@ obj-$(CONFIG_XEN_PCIDEV_FRONTEND)     += pcifront/
 obj-$(CONFIG_XEN_FRAMEBUFFER)          += fbfront/
 obj-$(CONFIG_XEN_KEYBOARD)             += fbfront/
 obj-$(CONFIG_XEN_PRIVCMD)      += privcmd/
+obj-$(CONFIG_XEN_GRANT_DEV)    += gntdev/

diff --git a/drivers/xen/gntdev/Makefile b/drivers/xen/gntdev/Makefile
index 6fbcd6447b0833470e9672b28a3abc297ee244e6..8bd8c62e43f14fe2d24433f3e4767f48bf452541 100644 (file)
--- a/drivers/xen/gntdev/Makefile
+++ b/drivers/xen/gntdev/Makefile
@@ -1 +1 @@
-obj-y  := gntdev.o
+obj-$(CONFIG_XEN_GRANT_DEV) := gntdev.o