Skip to content

Commit da4fa46

Browse files
keesintel-lab-lkp
authored andcommitted
configs/debug: Refresh debug config dependencies
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 7964cf8 ("mm: remove vmacache"). Signed-off-by: Kees Cook <[email protected]>
1 parent 9b90877 commit da4fa46

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

kernel/configs/debug.config

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ CONFIG_SECTION_MISMATCH_WARN_ONLY=y
2626
#
2727
# Generic Kernel Debugging Instruments
2828
#
29+
CONFIG_DEBUG_KERNEL=y
2930
# CONFIG_UBSAN_ALIGNMENT is not set
3031
# CONFIG_UBSAN_DIV_ZERO is not set
3132
# CONFIG_UBSAN_TRAP is not set
@@ -42,6 +43,7 @@ CONFIG_UBSAN_UNREACHABLE=y
4243
#
4344
# Networking Debugging
4445
#
46+
CONFIG_NET=y
4547
CONFIG_NET_DEV_REFCNT_TRACKER=y
4648
CONFIG_NET_NS_REFCNT_TRACKER=y
4749
CONFIG_DEBUG_NET=y
@@ -72,7 +74,6 @@ CONFIG_DEBUG_VIRTUAL=y
7274
CONFIG_DEBUG_VM=y
7375
CONFIG_DEBUG_VM_PGFLAGS=y
7476
CONFIG_DEBUG_VM_RB=y
75-
CONFIG_DEBUG_VM_VMACACHE=y
7677
CONFIG_KASAN=y
7778
CONFIG_KASAN_GENERIC=y
7879
CONFIG_KASAN_INLINE=y

kernel/configs/x86_debug.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
CONFIG_X86_DEBUG_FPU=y
33
CONFIG_LOCK_STAT=y
44
CONFIG_DEBUG_VM=y
5-
CONFIG_DEBUG_VM_VMACACHE=y
65
CONFIG_DEBUG_VM_RB=y
76
CONFIG_DEBUG_SLAB=y
87
CONFIG_DEBUG_KMEMLEAK=y

0 commit comments

Comments
 (0)