Patch "perf build: Fix btf__load_from_kernel_by_id() feature check" has been added to the 5.18-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    perf build: Fix btf__load_from_kernel_by_id() feature check

to the 5.18-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     perf-build-fix-btf__load_from_kernel_by_id-feature-c.patch
and it can be found in the queue-5.18 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit dfa6cc9712680f1021532f6146225b68bd41581b
Author: Jiri Olsa <jolsa@xxxxxxxxxx>
Date:   Tue May 24 14:06:12 2022 +0200

    perf build: Fix btf__load_from_kernel_by_id() feature check
    
    [ 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@xxxxxxxxxx>
    Cc: Heiko Carstens <hca@xxxxxxxxxxxxx>
    Cc: Ian Rogers <irogers@xxxxxxxxxx>
    Cc: Ilya Leoshkevich <iii@xxxxxxxxxxxxx>
    Cc: Sumanth Korikkar <sumanthk@xxxxxxxxxxxxx>
    Cc: Sven Schnelle <svens@xxxxxxxxxxxxx>
    Cc: Thomas Richter <tmricht@xxxxxxxxxxxxx>
    Cc: Vasily Gorbik <gor@xxxxxxxxxxxxx>
    Link: http://lore.kernel.org/linux-perf-users/YozLKby7ITEtchC9@krava
    Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

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;
 }