staging: Use GFP_ATOMIC when a lock is held

[safe/jmp/linux-2.6] / drivers / xen / Kconfig

diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
index 1bbb910..fad3df2 100644 (file)
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@ -1,6 +1,8 @@
+menu "Xen driver support"
+       depends on XEN
+
 config XEN_BALLOON
        bool "Xen memory balloon driver"
-       depends on XEN
        default y
        help
          The balloon driver allows the Xen domain to request more memory from
@@ -20,7 +22,6 @@ config XEN_SCRUB_PAGES
 
 config XEN_DEV_EVTCHN
        tristate "Xen /dev/xen/evtchn device"
-       depends on XEN
        default y
        help
          The evtchn driver allows a userspace process to triger event
@@ -30,7 +31,6 @@ config XEN_DEV_EVTCHN
 
 config XENFS
        tristate "Xen filesystem"
-       depends on XEN
        default y
        help
          The xen filesystem provides a way for domains to share
@@ -47,7 +47,19 @@ config XEN_COMPAT_XENFS
          The old xenstore userspace tools expect to find "xenbus"
          under /proc/xen, but "xenbus" is now found at the root of the
          xenfs filesystem.  Selecting this causes the kernel to create
-         the compatibilty mount point /proc/xen if it is running on
+         the compatibility mount point /proc/xen if it is running on
          a xen platform.
          If in doubt, say yes.
 
+config XEN_SYS_HYPERVISOR
+       bool "Create xen entries under /sys/hypervisor"
+       depends on SYSFS
+       select SYS_HYPERVISOR
+       default y
+       help
+         Create entries under /sys/hypervisor describing the Xen
+        hypervisor environment.  When running native or in another
+        virtual environment, /sys/hypervisor will still be present,
+        but will have no xen contents.
+
+endmenu