diff options
| author | Namhyung Kim <namhyung@kernel.org> | 2025-06-22 21:54:03 -0700 |
|---|---|---|
| committer | Namhyung Kim <namhyung@kernel.org> | 2025-06-22 21:54:03 -0700 |
| commit | c833e8cc4dca7e3c0a9d0b9047a1b4822b229262 (patch) | |
| tree | 7cfd4ca423884505425e7f473b280ba392fb6b7c /tools/lib | |
| parent | perf test: add test for BPF metadata collection (diff) | |
| parent | Linux 6.16-rc3 (diff) | |
| download | linux-c833e8cc4dca7e3c0a9d0b9047a1b4822b229262.tar.gz linux-c833e8cc4dca7e3c0a9d0b9047a1b4822b229262.zip | |
Merge tag 'v6.16-rc3' into perf-tools-next
To get the fixes in libbpf and perf tools.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Diffstat (limited to 'tools/lib')
| -rw-r--r-- | tools/lib/bpf/btf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c index f1d495dc66bb..37682908cb0f 100644 --- a/tools/lib/bpf/btf.c +++ b/tools/lib/bpf/btf.c @@ -1384,12 +1384,12 @@ static struct btf *btf_parse_raw_mmap(const char *path, struct btf *base_btf) fd = open(path, O_RDONLY); if (fd < 0) - return libbpf_err_ptr(-errno); + return ERR_PTR(-errno); if (fstat(fd, &st) < 0) { err = -errno; close(fd); - return libbpf_err_ptr(err); + return ERR_PTR(err); } data = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0); @@ -1397,7 +1397,7 @@ static struct btf *btf_parse_raw_mmap(const char *path, struct btf *base_btf) close(fd); if (data == MAP_FAILED) - return libbpf_err_ptr(err); + return ERR_PTR(err); btf = btf_new(data, st.st_size, base_btf, true); if (IS_ERR(btf)) |