From 48bdcaa2d6ae32bc2b8417706648c1d9aac93bcb Mon Sep 17 00:00:00 2001 From: Tony Ambardar Date: Thu, 30 May 2024 23:07:22 -0700 Subject: [PATCH] build: add option KERNEL_DEBUG_INFO_BTF_MODULES The recent kernel v6.6.31 update broke BTF-enabled builds since upstream Linux added a prompt for config option DEBUG_INFO_BTF_MODULES in commit 2166cb2e21 ("bpf, kconfig: Fix DEBUG_INFO_BTF_MODULES Kconfig definition"). Fix by updating Config-kernel.in to add the option, cleaning up a related dependency and whitespace also. Fixes: 10d77b9bc3 ("kernel: bump 6.6 to 6.6.31") Signed-off-by: Tony Ambardar (cherry picked from commit ab9bb79d8e30a574c7628c73c4522429805d9307) --- config/Config-kernel.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/config/Config-kernel.in b/config/Config-kernel.in index 3f94b6517c..562eca3930 100644 --- a/config/Config-kernel.in +++ b/config/Config-kernel.in @@ -352,7 +352,6 @@ config KERNEL_DEBUG_INFO This will compile your kernel and modules with debug information. config KERNEL_DEBUG_INFO_BTF - bool "Enable additional BTF type information" default y if (TARGET_armsr || TARGET_bcm27xx || TARGET_ipq806x_chromium || TARGET_ipq807x || TARGET_mediatek_filogic || TARGET_mvebu_cortexa53 || TARGET_mvebu_cortexa72 || TARGET_rockchip || TARGET_sunxi || TARGET_x86_64) && BUILDBOT depends on !HOST_OS_MACOS @@ -365,9 +364,13 @@ config KERNEL_DEBUG_INFO_BTF Required to run BPF CO-RE applications. +config KERNEL_DEBUG_INFO_BTF_MODULES + def_bool y + depends on KERNEL_DEBUG_INFO_BTF + config KERNEL_MODULE_ALLOW_BTF_MISMATCH bool "Allow loading modules with non-matching BTF type info" - depends on KERNEL_DEBUG_INFO_BTF + depends on KERNEL_DEBUG_INFO_BTF_MODULES default y help For modules whose split BTF does not match vmlinux, load without