The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 871808fd6981bcc6bb48f71032f983ca77748e96
Gitweb: https://git.kernel.org/tip/871808fd6981bcc6bb48f71032f983ca77748e96
Author: Lukas Bulwahn <lukas.bulwahn@xxxxxxxxx>
AuthorDate: Fri, 22 Jul 2022 14:18:15 +02:00
Committer: Borislav Petkov <bp@xxxxxxx>
CommitterDate: Wed, 27 Jul 2022 18:09:11 +02:00
x86/configs: Update configs in x86_debug.config
Commit
4675ff05de2d ("kmemcheck: rip it out")
removed kmemcheck and its corresponding build config KMEMCHECK.
Commit
0f620cefd775 ("objtool: Rename "VMLINUX_VALIDATION" -> "NOINSTR_VALIDATION"")
renamed the debug config option.
Adjust x86_debug.config to those changes in debug configs.
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@xxxxxxxxx>
Signed-off-by: Borislav Petkov <bp@xxxxxxx>
Link: https://lore.kernel.org/r/20220722121815.27535-1-lukas.bulwahn@xxxxxxxxx
---
kernel/configs/x86_debug.config | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/kernel/configs/x86_debug.config b/kernel/configs/x86_debug.config
index dcd86f3..6fac5b4 100644
--- a/kernel/configs/x86_debug.config
+++ b/kernel/configs/x86_debug.config
@@ -7,12 +7,11 @@ CONFIG_DEBUG_SLAB=y
CONFIG_DEBUG_KMEMLEAK=y
CONFIG_DEBUG_PAGEALLOC=y
CONFIG_SLUB_DEBUG_ON=y
-CONFIG_KMEMCHECK=y
CONFIG_DEBUG_OBJECTS=y
CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
CONFIG_GCOV_KERNEL=y
CONFIG_LOCKDEP=y
CONFIG_PROVE_LOCKING=y
CONFIG_SCHEDSTATS=y
-CONFIG_VMLINUX_VALIDATION=y
+CONFIG_NOINSTR_VALIDATION=y
CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
|