Merge tag 'audit-pr-20210426' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoor...

[linux-2.6-microblaze.git] / samples / bpf / sampleip_user.c

diff --git a/samples/bpf/sampleip_user.c b/samples/bpf/sampleip_user.c
index 4372d2d..921c505 100644 (file)
--- a/samples/bpf/sampleip_user.c
+++ b/samples/bpf/sampleip_user.c
@@ -18,9 +18,6 @@
 #include "perf-sys.h"
 #include "trace_helpers.h"
 
-#define __must_check
-#include <linux/err.h>
-
 #define DEFAULT_FREQ   99
 #define DEFAULT_SECS   5
 #define MAX_IPS                8192
@@ -57,7 +54,7 @@ static int sampling_start(int freq, struct bpf_program *prog,
                        return 1;
                }
                links[i] = bpf_program__attach_perf_event(prog, pmu_fd);
-               if (IS_ERR(links[i])) {
+               if (libbpf_get_error(links[i])) {
                        fprintf(stderr, "ERROR: Attach perf event\n");
                        links[i] = NULL;
                        close(pmu_fd);
@@ -182,7 +179,7 @@ int main(int argc, char **argv)
 
        snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);
        obj = bpf_object__open_file(filename, NULL);
-       if (IS_ERR(obj)) {
+       if (libbpf_get_error(obj)) {
                fprintf(stderr, "ERROR: opening BPF object file failed\n");
                obj = NULL;
                goto cleanup;