summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorTony Ambardar <itugrok@yahoo.com>2024-05-30 23:07:22 -0700
committerNick Hainke <vincent@systemli.org>2024-05-31 23:50:30 +0200
commitab9bb79d8e30a574c7628c73c4522429805d9307 (patch)
tree3d2b8a38720e41b2c03cfe894a22d90521fd2116 /config
parent4454361e54b749bdc0b524092aea2366b5d5ed98 (diff)
downloadopenwrt-ab9bb79d8e30a574c7628c73c4522429805d9307.tar.gz
openwrt-ab9bb79d8e30a574c7628c73c4522429805d9307.tar.bz2
openwrt-ab9bb79d8e30a574c7628c73c4522429805d9307.zip
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 <itugrok@yahoo.com>
Diffstat (limited to 'config')
-rw-r--r--config/Config-kernel.in7
1 files changed, 5 insertions, 2 deletions
diff --git a/config/Config-kernel.in b/config/Config-kernel.in
index 0acd320504..2d90abcfe8 100644
--- a/config/Config-kernel.in
+++ b/config/Config-kernel.in
@@ -435,7 +435,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"
depends on !HOST_OS_MACOS
depends on KERNEL_DEBUG_INFO && !KERNEL_DEBUG_INFO_REDUCED
@@ -447,9 +446,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
help
For modules whose split BTF does not match vmlinux, load without
BTF rather than refusing to load. The default behavior with