1 files changed, 20 insertions, 3 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 5f2ce616c046..c5cefb3c009c 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -167,6 +167,17 @@ config DEBUG_INFO_DWARF4
           But it significantly improves the success of resolving
           variables in gdb on optimized code.
 
+config GDB_SCRIPTS
+        bool "Provide GDB scripts for kernel debugging"
+        depends on DEBUG_INFO
+        help
+          This creates the required links to GDB helper scripts in the
+          build directory. If you load vmlinux into gdb, the helper
+          scripts will be automatically imported by gdb as well, and
+          additional functions are available to analyze a Linux kernel
+          instance. See Documentation/gdb-kernel-debugging.txt for further
+          details.
+
 config ENABLE_WARN_DEPRECATED
         bool "Enable __deprecated logic"
         default y
@@ -636,7 +647,7 @@ config DEBUG_STACKOVERFLOW
         depends on DEBUG_KERNEL && HAVE_DEBUG_STACKOVERFLOW
         ---help---
           Say Y here if you want to check for overflows of kernel, IRQ
-          and exception stacks (if your archicture uses them). This
+          and exception stacks (if your architecture uses them). This
           option will show detailed messages if free stack space drops
           below a certain limit.
 
@@ -651,6 +662,8 @@ config DEBUG_STACKOVERFLOW
 
 source "lib/Kconfig.kmemcheck"
 
+source "lib/Kconfig.kasan"
+
 endmenu # "Memory Debugging"
 
 config DEBUG_SHIRQ
@@ -1215,6 +1228,7 @@ config RCU_TORTURE_TEST
         tristate "torture tests for RCU"
         depends on DEBUG_KERNEL
         select TORTURE_TEST
+        select SRCU
         default n
         help
           This option provides a kernel module that runs torture tests
@@ -1257,7 +1271,7 @@ config RCU_CPU_STALL_TIMEOUT
 config RCU_CPU_STALL_INFO
         bool "Print additional diagnostics on RCU CPU stall"
         depends on (TREE_RCU || PREEMPT_RCU) && DEBUG_KERNEL
-        default n
+        default y
         help
           For each stalled CPU that is aware of the current RCU grace
           period, print out additional per-CPU diagnostic information
@@ -1579,6 +1593,9 @@ config ASYNC_RAID6_TEST
 
           If unsure, say N.
 
+config TEST_HEXDUMP
+        tristate "Test functions located in the hexdump module at runtime"
+
 config TEST_STRING_HELPERS
         tristate "Test functions located in the string_helpers module at runtime"
 
@@ -1586,7 +1603,7 @@ config TEST_KSTRTOX
         tristate "Test kstrto*() family of functions at runtime"
 
 config TEST_RHASHTABLE
-        bool "Perform selftest on resizable hash table"
+        tristate "Perform selftest on resizable hash table"
         default n
         help
           Enable this option to test the rhashtable functions at boot.