Skip to content

Commit

Permalink
build: add option KERNEL_DEBUG_INFO_BTF_MODULES
Browse files Browse the repository at this point in the history
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: 10d77b9 ("kernel: bump 6.6 to 6.6.31")
Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
  • Loading branch information
guidosarducci committed May 31, 2024
1 parent 50e26e6 commit 2776600
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions config/Config-kernel.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 2776600

Please sign in to comment.