lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.17 598/772] perf build: Fix btf__load_from_kernel_by_id() feature check
    Date
    From: Jiri Olsa <jolsa@kernel.org>

    [ Upstream commit 73534617dfa3c4cd95fe5ffaeff5315e9ffc2de6 ]

    The btf__load_from_kernel_by_id() only takes one arg, not two.

    Committer notes:

    I tested it just with an older libbpf, one where
    btf__load_from_kernel_by_id() wasn't introduced yet.

    A test with a newer dynamic libbpf would fail because the
    btf__load_from_kernel_by_id() is there, but takes just one arg.

    Fixes: 0ae065a5d265bc5a ("perf build: Fix check for btf__load_from_kernel_by_id() in libbpf")
    Signed-off-by: Jiri Olsa <jolsa@kernel.org>
    Cc: Heiko Carstens <hca@linux.ibm.com>
    Cc: Ian Rogers <irogers@google.com>
    Cc: Ilya Leoshkevich <iii@linux.ibm.com>
    Cc: Sumanth Korikkar <sumanthk@linux.ibm.com>
    Cc: Sven Schnelle <svens@linux.ibm.com>
    Cc: Thomas Richter <tmricht@linux.ibm.com>
    Cc: Vasily Gorbik <gor@linux.ibm.com>
    Link: http://lore.kernel.org/linux-perf-users/YozLKby7ITEtchC9@krava
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    .../build/feature/test-libbpf-btf__load_from_kernel_by_id.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/tools/build/feature/test-libbpf-btf__load_from_kernel_by_id.c b/tools/build/feature/test-libbpf-btf__load_from_kernel_by_id.c
    index f7c084428735..a17647f7d5a4 100644
    --- a/tools/build/feature/test-libbpf-btf__load_from_kernel_by_id.c
    +++ b/tools/build/feature/test-libbpf-btf__load_from_kernel_by_id.c
    @@ -1,7 +1,8 @@
    // SPDX-License-Identifier: GPL-2.0
    -#include <bpf/libbpf.h>
    +#include <bpf/btf.h>

    int main(void)
    {
    - return btf__load_from_kernel_by_id(20151128, NULL);
    + btf__load_from_kernel_by_id(20151128);
    + return 0;
    }
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-07 23:33    [W:3.323 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site