diff options
| author | Uwe Kleine-König <ukleinek@kernel.org> | 2025-07-09 11:48:21 +0300 |
|---|---|---|
| committer | Uwe Kleine-König <ukleinek@kernel.org> | 2025-07-09 11:48:21 +0300 |
| commit | 2b2aeaa12c804e52f2ba635899f2b7f2d4623874 (patch) | |
| tree | 4b7f9abb6af166b70ab177ab0458b8984f005ee2 /tools/lib | |
| parent | edd3bcb1801e1bb98f4f81485140e18c86406ced (diff) | |
| parent | cd4da713f99651e99fbce8ed6b6ec8f686c029a8 (diff) | |
| download | linux-2b2aeaa12c804e52f2ba635899f2b7f2d4623874.tar.xz | |
Merge tag 'pm-runtime-6.17-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Runtime PM updates related to autosuspend for 6.17
Make several autosuspend functions mark last busy stamp and update
the documentation accordingly (Sakari Ailus).
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)) |