[PATCH] configs/debug: Refresh debug config dependencies

[Kees Cook <kees@kernel.org>]

Many of the CONFIG_DEBUG* options need CONFIG_DEBUG_KERNEL=y to be set,
so enable it explicitly. Similarly for CONFIG_NET* options, enable
CONFIG_NET=y. Finally, remove CONFIG_DEBUG_VM_VMACACHE, since it was
removed in commit 7964cf8caa4d ("mm: remove vmacache").

Signed-off-by: Kees Cook <kees@kernel.org>
---
Cc: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Masahiro Yamada <masahiroy@kernel.org>
Cc: Simon Horman <horms@kernel.org>
Cc: Anshuman Khandual <anshuman.khandual@arm.com>
Cc: Stanislav Fomichev <sdf@fomichev.me>
Cc: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: Nicolas Schier <nicolas.schier@linux.dev>
Cc: Michael Ellerman <mpe@ellerman.id.au>
---
 kernel/configs/debug.config     | 3 ++-
 kernel/configs/x86_debug.config | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/configs/debug.config b/kernel/configs/debug.config
index e81327d2cd63..1a8724f29137 100644
--- a/kernel/configs/debug.config
+++ b/kernel/configs/debug.config
@@ -26,6 +26,7 @@ CONFIG_SECTION_MISMATCH_WARN_ONLY=y
 #
 # Generic Kernel Debugging Instruments
 #
+CONFIG_DEBUG_KERNEL=y
 # CONFIG_UBSAN_ALIGNMENT is not set
 # CONFIG_UBSAN_DIV_ZERO is not set
 # CONFIG_UBSAN_TRAP is not set
@@ -42,6 +43,7 @@ CONFIG_UBSAN_UNREACHABLE=y
 #
 # Networking Debugging
 #
+CONFIG_NET=y
 CONFIG_NET_DEV_REFCNT_TRACKER=y
 CONFIG_NET_NS_REFCNT_TRACKER=y
 CONFIG_DEBUG_NET=y
@@ -72,7 +74,6 @@ CONFIG_DEBUG_VIRTUAL=y
 CONFIG_DEBUG_VM=y
 CONFIG_DEBUG_VM_PGFLAGS=y
 CONFIG_DEBUG_VM_RB=y
-CONFIG_DEBUG_VM_VMACACHE=y
 CONFIG_KASAN=y
 CONFIG_KASAN_GENERIC=y
 CONFIG_KASAN_INLINE=y
diff --git a/kernel/configs/x86_debug.config b/kernel/configs/x86_debug.config
index 35f48671b8d5..28d1c6ba3bf0 100644
--- a/kernel/configs/x86_debug.config
+++ b/kernel/configs/x86_debug.config
@@ -2,7 +2,6 @@
 CONFIG_X86_DEBUG_FPU=y
 CONFIG_LOCK_STAT=y
 CONFIG_DEBUG_VM=y
-CONFIG_DEBUG_VM_VMACACHE=y
 CONFIG_DEBUG_VM_RB=y
 CONFIG_DEBUG_SLAB=y
 CONFIG_DEBUG_KMEMLEAK=y
-- 
2.34.1