perf bpf: Stop using deprecated bpf_load_program() API

[linux-2.6-microblaze.git] / tools / perf / tests / bpf.c

diff --git a/tools/perf/tests/bpf.c b/tools/perf/tests/bpf.c
index 5734905..57b9591 100644 (file)
--- a/tools/perf/tests/bpf.c
+++ b/tools/perf/tests/bpf.c
@@ -281,8 +281,8 @@ out:
 
 static int check_env(void)
 {
+       LIBBPF_OPTS(bpf_prog_load_opts, opts);
        int err;
-       unsigned int kver_int;
        char license[] = "GPL";
 
        struct bpf_insn insns[] = {
@@ -290,19 +290,13 @@ static int check_env(void)
                BPF_EXIT_INSN(),
        };
 
-       err = fetch_kernel_version(&kver_int, NULL, 0);
+       err = fetch_kernel_version(&opts.kern_version, NULL, 0);
        if (err) {
                pr_debug("Unable to get kernel version\n");
                return err;
        }
-
-/* temporarily disable libbpf deprecation warnings */
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-       err = bpf_load_program(BPF_PROG_TYPE_KPROBE, insns,
-                              ARRAY_SIZE(insns),
-                              license, kver_int, NULL, 0);
-#pragma GCC diagnostic pop
+       err = bpf_prog_load(BPF_PROG_TYPE_KPROBE, NULL, license, insns,
+                           ARRAY_SIZE(insns), &opts);
        if (err < 0) {
                pr_err("Missing basic BPF support, skip this test: %s\n",
                       strerror(errno));