]> git.baikalelectronics.ru Git - kernel.git/commitdiff
perf bpf: Ignore deprecation warning when using libbpf's btf__get_from_id()
authorAndrii Nakryiko <andrii@kernel.org>
Tue, 14 Sep 2021 17:00:04 +0000 (10:00 -0700)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Sat, 18 Sep 2021 20:47:02 +0000 (17:47 -0300)
Perf code re-implements libbpf's btf__load_from_kernel_by_id() API as
a weak function, presumably to dynamically link against old version of
libbpf shared library. Unfortunately this causes compilation warning
when perf is compiled against libbpf v0.6+.

For now, just ignore deprecation warning, but there might be a better
solution, depending on perf's needs.

Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: kernel-team@fb.com
LPU-Reference: 20210914170004.4185659-1-andrii@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/util/bpf-event.c

index 683f6d63560ed2794a1b7d0293be0cbf87536f8e..1a7112a87736ab5899b1f1d77f1b2044e1356cf0 100644 (file)
 struct btf * __weak btf__load_from_kernel_by_id(__u32 id)
 {
        struct btf *btf;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
        int err = btf__get_from_id(id, &btf);
+#pragma GCC diagnostic pop
 
        return err ? ERR_PTR(err) : btf;
 }