Merge tag 'kbuild-fixes-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/masahi...

[platform/kernel/linux-starfive.git] / lib / Kconfig.debug

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 5c1c635..3fc7abf 100644 (file)
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -823,13 +823,12 @@ config DEBUG_VM
 
          If unsure, say N.
 
-config DEBUG_VM_VMACACHE
-       bool "Debug VMA caching"
+config DEBUG_VM_MAPLE_TREE
+       bool "Debug VM maple trees"
        depends on DEBUG_VM
+       select DEBUG_MAPLE_TREE
        help
-         Enable this to turn on VMA caching debug information. Doing so
-         can cause significant overhead, so only enable it in non-production
-         environments.
+         Enable VM maple tree debugging information and extra validations.
 
          If unsure, say N.
 
@@ -982,6 +981,7 @@ config DEBUG_STACKOVERFLOW
 
 source "lib/Kconfig.kasan"
 source "lib/Kconfig.kfence"
+source "lib/Kconfig.kmsan"
 
 endmenu # "Memory Debugging"
 
@@ -1646,6 +1646,14 @@ config BUG_ON_DATA_CORRUPTION
 
          If unsure, say N.
 
+config DEBUG_MAPLE_TREE
+       bool "Debug maple trees"
+       depends on DEBUG_KERNEL
+       help
+         Enable maple tree debugging information and extra validations.
+
+         If unsure, say N.
+
 endmenu
 
 config DEBUG_CREDENTIALS