Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux-2.6-microblaze.git] / lib / Kconfig.debug

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 64d7c19..6088408 100644 (file)
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -217,7 +217,7 @@ config ENABLE_MUST_CHECK
 config FRAME_WARN
        int "Warn for stack frames larger than (needs gcc 4.4)"
        range 0 8192
-       default 0 if KASAN
+       default 3072 if KASAN_EXTRA
        default 2048 if GCC_PLUGIN_LATENT_ENTROPY
        default 1280 if (!64BIT && PARISC)
        default 1024 if (!64BIT && !PARISC)
@@ -351,7 +351,6 @@ config SECTION_MISMATCH_WARN_ONLY
 #
 config ARCH_WANT_FRAME_POINTERS
        bool
-       help
 
 config FRAME_POINTER
        bool "Compile the kernel with frame pointers"
@@ -1641,7 +1640,10 @@ config DMA_API_DEBUG
 
          If unsure, say N.
 
-menu "Runtime Testing"
+menuconfig RUNTIME_TESTING_MENU
+       bool "Runtime Testing"
+
+if RUNTIME_TESTING_MENU
 
 config LKDTM
        tristate "Linux Kernel Dump Test Tool Module"
@@ -1841,7 +1843,7 @@ config TEST_BPF
 
          If unsure, say N.
 
-config TEST_FIND_BIT
+config FIND_BIT_BENCHMARK
        tristate "Test find_bit functions"
        default n
        help
@@ -1929,7 +1931,7 @@ config TEST_DEBUG_VIRTUAL
 
          If unsure, say N.
 
-endmenu # runtime tests
+endif # RUNTIME_TESTING_MENU
 
 config MEMTEST
        bool "Memtest"