diff options
author | Jonathan Corbet <corbet@lwn.net> | 2018-07-02 11:14:50 -0600 |
---|---|---|
committer | Jonathan Corbet <corbet@lwn.net> | 2018-07-02 11:14:50 -0600 |
commit | 5f6654094ff35a7a92eb76667788ef633595e4ea (patch) | |
tree | 8404c5fb245cddbc6877b97a9bf53139c95da852 /tools/bpf/bpftool/perf.c | |
parent | 5105730fbf6789ff9e20837bdefe32e8ba133595 (diff) | |
parent | 021c91791a5e7e85c567452f1be3e4c2c6cb6063 (diff) | |
download | kernel_replicant_linux-5f6654094ff35a7a92eb76667788ef633595e4ea.tar.gz kernel_replicant_linux-5f6654094ff35a7a92eb76667788ef633595e4ea.tar.bz2 kernel_replicant_linux-5f6654094ff35a7a92eb76667788ef633595e4ea.zip |
Merge tag 'v4.18-rc3' into docs-next
-rc1 broke the docs build due to changes in the e100/e1000 drivers; -rc3
got the fixes via the networking tree. Pull in -rc3 so that the docs tree
can actually build the docs again.
Diffstat (limited to 'tools/bpf/bpftool/perf.c')
-rw-r--r-- | tools/bpf/bpftool/perf.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/bpf/bpftool/perf.c b/tools/bpf/bpftool/perf.c index ac6b1a12c9b7..b76b77dcfd1f 100644 --- a/tools/bpf/bpftool/perf.c +++ b/tools/bpf/bpftool/perf.c @@ -29,9 +29,10 @@ static bool has_perf_query_support(void) if (perf_query_supported) goto out; - fd = open(bin_name, O_RDONLY); + fd = open("/", O_RDONLY); if (fd < 0) { - p_err("perf_query_support: %s", strerror(errno)); + p_err("perf_query_support: cannot open directory \"/\" (%s)", + strerror(errno)); goto out; } |