1 files changed, 66 insertions, 17 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 7a638aa3545b..a28590083622 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -15,7 +15,7 @@ config PRINTK_TIME
           The behavior is also controlled by the kernel command line
           parameter printk.time=1. See Documentation/kernel-parameters.txt
 
-config DEFAULT_MESSAGE_LOGLEVEL
+config MESSAGE_LOGLEVEL_DEFAULT
         int "Default message log level (1-7)"
         range 1 7
         default "4"
@@ -143,6 +143,30 @@ config DEBUG_INFO_REDUCED
           DEBUG_INFO build and compile times are reduced too.
           Only works with newer gcc versions.
 
+config DEBUG_INFO_SPLIT
+        bool "Produce split debuginfo in .dwo files"
+        depends on DEBUG_INFO
+        help
+          Generate debug info into separate .dwo files. This significantly
+          reduces the build directory size for builds with DEBUG_INFO,
+          because it stores the information only once on disk in .dwo
+          files instead of multiple times in object files and executables.
+          In addition the debug information is also compressed.
+
+          Requires recent gcc (4.7+) and recent gdb/binutils.
+          Any tool that packages or reads debug information would need
+          to know about the .dwo files and include them.
+          Incompatible with older versions of ccache.
+
+config DEBUG_INFO_DWARF4
+        bool "Generate dwarf4 debuginfo"
+        depends on DEBUG_INFO
+        help
+          Generate dwarf4 debug info. This requires recent versions
+          of gcc and gdb. It makes the debug information larger.
+          But it significantly improves the success of resolving
+          variables in gdb on optimized code.
+
 config ENABLE_WARN_DEPRECATED
         bool "Enable __deprecated logic"
         default y
@@ -835,7 +859,7 @@ config DEBUG_RT_MUTEXES
 
 config RT_MUTEX_TESTER
         bool "Built-in scriptable tester for rt-mutexes"
-        depends on DEBUG_KERNEL && RT_MUTEXES
+        depends on DEBUG_KERNEL && RT_MUTEXES && BROKEN
         help
           This option enables a rt-mutex tester.
 
@@ -868,6 +892,10 @@ config DEBUG_WW_MUTEX_SLOWPATH
          the full mutex checks enabled with (CONFIG_PROVE_LOCKING) this
          will test all possible w/w mutex interface abuse with the
          exception of simply not acquiring all the required locks.
+         Note that this feature can introduce significant overhead, so
+         it really should not be enabled in a production or distro kernel,
+         even a debug kernel.  If you are a driver writer, enable it.  If
+         you are a distro, do not.
 
 config DEBUG_LOCK_ALLOC
         bool "Lock debugging: detect incorrect freeing of live locks"
@@ -1008,8 +1036,13 @@ config TRACE_IRQFLAGS
           either tracing or lock debugging.
 
 config STACKTRACE
-        bool
+        bool "Stack backtrace support"
         depends on STACKTRACE_SUPPORT
+        help
+          This option causes the kernel to create a /proc/pid/stack for
+          every process, showing its current stack trace.
+          It is also used by various kernel debugging features that require
+          stack trace generation.
 
 config DEBUG_KOBJECT
         bool "kobject debugging"
@@ -1131,20 +1164,6 @@ config PROVE_RCU_REPEATEDLY
 
          Say N if you are unsure.
 
-config PROVE_RCU_DELAY
-        bool "RCU debugging: preemptible RCU race provocation"
-        depends on DEBUG_KERNEL && PREEMPT_RCU
-        default n
-        help
-         There is a class of races that involve an unlikely preemption
-         of __rcu_read_unlock() just after ->rcu_read_lock_nesting has
-         been set to INT_MIN.  This feature inserts a delay at that
-         point to increase the probability of these races.
-
-         Say Y to increase probability of preemption of __rcu_read_unlock().
-
-         Say N if you are unsure.
-
 config SPARSE_RCU_POINTER
         bool "RCU debugging: sparse-based checks for pointer usage"
         default n
@@ -1550,6 +1569,14 @@ config TEST_STRING_HELPERS
 config TEST_KSTRTOX
         tristate "Test kstrto*() family of functions at runtime"
 
+config TEST_RHASHTABLE
+        bool "Perform selftest on resizable hash table"
+        default n
+        help
+          Enable this option to test the rhashtable functions at boot.
+
+          If unsure, say N.
+
 endmenu # runtime tests
 
 config PROVIDE_OHCI1394_DMA_INIT
@@ -1649,6 +1676,28 @@ config TEST_BPF
 
           If unsure, say N.
 
+config TEST_FIRMWARE
+        tristate "Test firmware loading via userspace interface"
+        default n
+        depends on FW_LOADER
+        help
+          This builds the "test_firmware" module that creates a userspace
+          interface for testing firmware loading. This can be used to
+          control the triggering of firmware loading without needing an
+          actual firmware-using device. The contents can be rechecked by
+          userspace.
+
+          If unsure, say N.
+
+config TEST_UDELAY
+        tristate "udelay test driver"
+        default n
+        help
+          This builds the "udelay_test" module that helps to make sure
+          that udelay() is working properly.
+
+          If unsure, say N.
+
 source "samples/Kconfig"
 
 source "lib/Kconfig.kgdb"