diff options
| author | Ingo Molnar | 2018-05-25 08:02:43 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2018-05-25 08:02:43 +0200 |
| commit | bd9c67ad9693bacef086d65c1c6744645d4777e7 (patch) | |
| tree | 1dcbac332819a79dbaa1a1a836a8485f866568ad /tools/lib | |
| parent | 861410270ab5b13f72fc9afc74fa60f3eb7c2b7e (diff) | |
| parent | b50694381cfc22dce3a60a291cdae294a5e5777c (diff) | |
Merge branch 'linus' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/lib')
| -rw-r--r-- | tools/lib/bpf/libbpf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 5922443063f0..0f9f06df49bc 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -2035,7 +2035,7 @@ int bpf_prog_load_xattr(const struct bpf_prog_load_attr *attr, return -EINVAL; obj = bpf_object__open(attr->file); - if (IS_ERR(obj)) + if (IS_ERR_OR_NULL(obj)) return -ENOENT; bpf_object__for_each_program(prog, obj) { |