Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[deliverable/linux.git] / lib / Kconfig.debug

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 073496dea848262e6b3324a50b241cf130ae4dbd..ee1ac1cc082c10318c2ae6f88890124e9c9c934e 100644 (file)
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -812,6 +812,17 @@ config BOOTPARAM_HUNG_TASK_PANIC_VALUE
        default 0 if !BOOTPARAM_HUNG_TASK_PANIC
        default 1 if BOOTPARAM_HUNG_TASK_PANIC
 
+config WQ_WATCHDOG
+       bool "Detect Workqueue Stalls"
+       depends on DEBUG_KERNEL
+       help
+         Say Y here to enable stall detection on workqueues.  If a
+         worker pool doesn't make forward progress on a pending work
+         item for over a given amount of time, 30s by default, a
+         warning message is printed along with dump of workqueue
+         state.  This can be configured through kernel parameter
+         "workqueue.watchdog_thresh" and its sysfs counterpart.
+
 endmenu # "Debug lockups and hangs"
 
 config PANIC_ON_OOPS
@@ -1484,6 +1495,29 @@ config OF_RECONFIG_NOTIFIER_ERROR_INJECT
 
          If unsure, say N.
 
+config NETDEV_NOTIFIER_ERROR_INJECT
+       tristate "Netdev notifier error injection module"
+       depends on NET && NOTIFIER_ERROR_INJECTION
+       help
+         This option provides the ability to inject artificial errors to
+         netdevice notifier chain callbacks.  It is controlled through debugfs
+         interface /sys/kernel/debug/notifier-error-inject/netdev
+
+         If the notifier call chain should be failed with some events
+         notified, write the error code to "actions/<notifier event>/error".
+
+         Example: Inject netdevice mtu change error (-22 = -EINVAL)
+
+         # cd /sys/kernel/debug/notifier-error-inject/netdev
+         # echo -22 > actions/NETDEV_CHANGEMTU/error
+         # ip link set eth0 mtu 1024
+         RTNETLINK answers: Invalid argument
+
+         To compile this code as a module, choose M here: the module will
+         be called netdev-notifier-error-inject.
+
+         If unsure, say N.
+
 config FAULT_INJECTION
        bool "Fault-injection framework"
        depends on DEBUG_KERNEL
@@ -1523,8 +1557,7 @@ config FAIL_IO_TIMEOUT
 
 config FAIL_MMC_REQUEST
        bool "Fault-injection capability for MMC IO"
-       select DEBUG_FS
-       depends on FAULT_INJECTION && MMC
+       depends on FAULT_INJECTION_DEBUG_FS && MMC
        help
          Provide fault-injection capability for MMC IO.
          This will make the mmc core return data errors. This is