diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-08-16 09:04:28 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-08-16 09:04:28 +0200 |
| commit | 2dec48c32a349e51920b6a53b464982db4ed1563 (patch) | |
| tree | 2b9cccff8a823d9c6c1a06865f788b183f72d48f /tools/lib/bpf/btf.c | |
| parent | cea45a3bd2dd4d9c35581328f571afd32b3c9f48 (diff) | |
| parent | 7c60610d476766e128cc4284bb6349732cbd6606 (diff) | |
Merge 5.14-rc6 into usb-next
We need the USB fix in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/lib/bpf/btf.c')
| -rw-r--r-- | tools/lib/bpf/btf.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c index b46760b93bb4..7ff3d5ce44f9 100644 --- a/tools/lib/bpf/btf.c +++ b/tools/lib/bpf/btf.c @@ -804,6 +804,7 @@ static struct btf *btf_new(const void *data, __u32 size, struct btf *base_btf) btf->nr_types = 0; btf->start_id = 1; btf->start_str_off = 0; + btf->fd = -1; if (base_btf) { btf->base_btf = base_btf; @@ -832,8 +833,6 @@ static struct btf *btf_new(const void *data, __u32 size, struct btf *base_btf) if (err) goto done; - btf->fd = -1; - done: if (err) { btf__free(btf); |