Merge branch 'akpm-current/current'

[karo-tx-linux.git] / drivers / base / Kconfig

diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
index 0fb820cf2143583162facb26b48e1d1c173073d6..00e13ce5cbbd2069b3518a573d9737120dfb9cec 100644 (file)
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
@@ -1,10 +1,10 @@
 menu "Generic Driver Options"
 
-config UEVENT_HELPER_PATH
-       string "path to uevent helper"
-       default ""
+config UEVENT_HELPER
+       bool "Support for uevent helper"
+       default y
        help
-         Path to uevent helper program forked by the kernel for
+         The uevent helper program is forked by the kernel for
          every uevent.
          Before the switch to the netlink-based uevent source, this was
          used to hook hotplug scripts into kernel device events. It
@@ -15,8 +15,13 @@ config UEVENT_HELPER_PATH
          that it creates a high system load, or on smaller systems
          it is known to create out-of-memory situations during bootup.
 
-         To disable user space helper program execution at early boot
-         time specify an empty string here. This setting can be altered
+config UEVENT_HELPER_PATH
+       string "path to uevent helper"
+       depends on UEVENT_HELPER
+       default ""
+       help
+         To disable user space helper program execution at by default
+         specify an empty string here. This setting can still be altered
          via /proc/sys/kernel/hotplug or via /sys/kernel/uevent_helper
          later at runtime.
 
@@ -203,6 +208,15 @@ config DMA_SHARED_BUFFER
          APIs extension; the file's descriptor can then be passed on to other
          driver.
 
+config FENCE_TRACE
+       bool "Enable verbose FENCE_TRACE messages"
+       depends on DMA_SHARED_BUFFER
+       help
+         Enable the FENCE_TRACE printks. This will add extra
+         spam to the console log, but will make it easier to diagnose
+         lockup related problems for dma-buffers shared across multiple
+         devices.
+
 config DMA_CMA
        bool "DMA Contiguous Memory Allocator"
        depends on HAVE_DMA_CONTIGUOUS && CMA