diff options
| author | Greg Kroah-Hartman | 2019-05-03 18:03:47 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-05-03 18:03:47 +0200 |
| commit | 12456e509be25d24fe479394852428517922d02a (patch) | |
| tree | 8b1e8e1025ce1beb350bbf977ac8b8ffdd5fbfa1 /tools/lib/bpf/btf.c | |
| parent | Merge tag 'usb-serial-5.2-rc1' of https://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | Linux 5.1-rc7 (diff) | |
| download | kernel-qcow2-linux-12456e509be25d24fe479394852428517922d02a.tar.gz kernel-qcow2-linux-12456e509be25d24fe479394852428517922d02a.tar.xz kernel-qcow2-linux-12456e509be25d24fe479394852428517922d02a.zip | |
Merge 5.1-rc7 into usb-next
We need this to make the usb-gadget branch merge cleaner. And for
testing to keep from hitting the same issues already fixed.
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, 3 insertions, 0 deletions
diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c index 87e3020ac1bc..cf119c9b6f27 100644 --- a/tools/lib/bpf/btf.c +++ b/tools/lib/bpf/btf.c @@ -2107,6 +2107,9 @@ static int btf_dedup_is_equiv(struct btf_dedup *d, __u32 cand_id, return fwd_kind == real_kind; } + if (cand_kind != canon_kind) + return 0; + switch (cand_kind) { case BTF_KIND_INT: return btf_equal_int(cand_type, canon_type); |