resolve_btfids now emits all kfunc-specific BTF annotations for the kernel: the "bpf_kfunc" and "bpf_fastcall" decl tags and the address_space(1) type attribute on arena kfunc return/arguments. These were previously produced by pahole under the "decl_tag_kfuncs" and "attributes" btf_features. Drop both from the pahole invocation. Note that "decl_tag" (generic source __attribute__((btf_decl_tag)) annotations) is a separate feature from "decl_tag_kfuncs" and must be kept. Signed-off-by: Ihor Solodrai --- scripts/Makefile.btf | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/Makefile.btf b/scripts/Makefile.btf index e66e13e79653..a1812985a61a 100644 --- a/scripts/Makefile.btf +++ b/scripts/Makefile.btf @@ -14,9 +14,7 @@ pahole-flags-$(call test-ge, $(pahole-ver), 125) += --skip_encoding_btf_inconsis else # Switch to using --btf_features for v1.26 and later. -pahole-flags-$(call test-ge, $(pahole-ver), 126) = -j$(JOBS) --btf_features=encode_force,var,float,enum64,decl_tag,type_tag,optimized_func,consistent_func,decl_tag_kfuncs - -pahole-flags-$(call test-ge, $(pahole-ver), 130) += --btf_features=attributes +pahole-flags-$(call test-ge, $(pahole-ver), 126) = -j$(JOBS) --btf_features=encode_force,var,float,enum64,decl_tag,type_tag,optimized_func,consistent_func pahole-flags-$(call test-ge, $(pahole-ver), 131) += --btf_features=layout -- 2.54.0