Merge tag 'upstream-4.3-rc4' of git://git.infradead.org/linux-ubifs

[linux-drm-fsl-dcu.git] / lib / Kconfig.debug

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 3e0b662cae09611b5628c474cc58e448c3cefdc7..ab76b99adc857fb38c2e4677b6ab34d6a01fa786 100644 (file)
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -916,12 +916,6 @@ config DEBUG_RT_MUTEXES
         This allows rt mutex semantics violations and rt mutex related
         deadlocks (lockups) to be detected and reported automatically.
 
-config RT_MUTEX_TESTER
-       bool "Built-in scriptable tester for rt-mutexes"
-       depends on DEBUG_KERNEL && RT_MUTEXES && BROKEN
-       help
-         This option enables a rt-mutex tester.
-
 config DEBUG_SPINLOCK
        bool "Spinlock and rw-lock debugging: basic checks"
        depends on DEBUG_KERNEL
@@ -1528,6 +1522,13 @@ config FAIL_MMC_REQUEST
          and to test how the mmc host driver handles retries from
          the block device.
 
+config FAIL_FUTEX
+       bool "Fault-injection capability for futexes"
+       select DEBUG_FS
+       depends on FAULT_INJECTION && FUTEX
+       help
+         Provide fault-injection capability for futexes.
+
 config FAULT_INJECTION_DEBUG_FS
        bool "Debugfs entries for fault-injection capabilities"
        depends on FAULT_INJECTION && SYSFS && DEBUG_FS
@@ -1826,6 +1827,15 @@ config MEMTEST
                memtest=17, mean do 17 test patterns.
          If you are unsure how to answer this question, answer N.
 
+config TEST_STATIC_KEYS
+       tristate "Test static keys"
+       default n
+       depends on m
+       help
+         Test the static key interfaces.
+
+         If unsure, say N.
+
 source "samples/Kconfig"
 
 source "lib/Kconfig.kgdb"