btf: remove redundant CONFIG_BPF test in scripts/link-vmlinux.sh

JIRA: https://issues.redhat.com/browse/RHEL-63880

Conflicts: Context change due to missing commit ddf41329839f ("kbuild:
refactor variables in scripts/link-vmlinux.sh")

commit c980dc9c67a94ab716ffc06767cb435480bda09d
Author: Masahiro Yamada <masahiroy@kernel.org>
Date:   Sat Sep 14 02:37:52 2024 +0900

    btf: remove redundant CONFIG_BPF test in scripts/link-vmlinux.sh

    CONFIG_DEBUG_INFO_BTF depends on CONFIG_BPF_SYSCALL, which in turn
    selects CONFIG_BPF.

    When CONFIG_DEBUG_INFO_BTF=y, CONFIG_BPF=y is always met.

    Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
    Reviewed-by: Alan Maguire <alan.maguire@oracle.com>
    Acked-by: Andrii Nakryiko <andrii@kernel.org>
    Reviewed-by: Nathan Chancellor <nathan@kernel.org>
    Link: https://lore.kernel.org/r/20240913173759.1316390-1-masahiroy@kernel.org
    Signed-off-by: Alexei Starovoitov <ast@kernel.org>

Signed-off-by: Jerome Marchand <jmarchan@redhat.com>
This commit is contained in:
Jerome Marchand 2024-12-18 17:17:41 +01:00
parent c3259cbfec
commit 6646872b81
1 changed files with 1 additions and 1 deletions

View File

@ -312,7 +312,7 @@ fi
vmlinux_link vmlinux "${kallsymso}" ${btf_vmlinux_bin_o}
# fill in BTF IDs
if is_enabled CONFIG_DEBUG_INFO_BTF && is_enabled CONFIG_BPF; then
if is_enabled CONFIG_DEBUG_INFO_BTF; then
info BTFIDS vmlinux
${RESOLVE_BTFIDS} vmlinux
fi