diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-06-01 20:58:44 +0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-06-01 20:58:44 +0300 |
| commit | 0ab8009b3e8dd6baf54751e734b8734bc0fcde5e (patch) | |
| tree | 926957e39e8458339b7589082a4949c060f4a76f /tools/perf/util | |
| parent | 79e157b00853af0e96d76997a93feec476a23bfa (diff) | |
| parent | c2131f7e73c9e9365613e323d65c7b9e5b910f56 (diff) | |
| download | linux-0ab8009b3e8dd6baf54751e734b8734bc0fcde5e.tar.xz | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes from perf/urgent to allow perf/core to be used for new
development.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util')
| -rw-r--r-- | tools/perf/util/bpf_counter.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/util/bpf_counter.c b/tools/perf/util/bpf_counter.c index ddb52f748c8e..974f10e356f0 100644 --- a/tools/perf/util/bpf_counter.c +++ b/tools/perf/util/bpf_counter.c @@ -451,10 +451,10 @@ static int bperf_reload_leader_program(struct evsel *evsel, int attr_map_fd, goto out; } - err = -1; link = bpf_program__attach(skel->progs.on_switch); - if (!link) { + if (IS_ERR(link)) { pr_err("Failed to attach leader program\n"); + err = PTR_ERR(link); goto out; } |