diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-05-27 09:22:11 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-05-27 09:55:10 -0700 |
| commit | 5ada57a9a6b0be0e6dfcbd4afa519b0347fd5649 (patch) | |
| tree | f82f466df9272bb0c385320b25adc51c45309f84 /tools/lib | |
| parent | 59c56342459a483d5e563ed8b5fdb77ab7622a73 (diff) | |
| parent | d7c5303fbc8ac874ae3e597a5a0d3707dc0230b4 (diff) | |
| download | linux-5ada57a9a6b0be0e6dfcbd4afa519b0347fd5649.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
cdc-wdm: s/kill_urbs/poison_urbs/ to fix build
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'tools/lib')
| -rw-r--r-- | tools/lib/bpf/libbpf.c | 3 | ||||
| -rw-r--r-- | tools/lib/bpf/libbpf_internal.h | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index dc4d5fe6d9d2..69cd1a835ebd 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -3252,6 +3252,9 @@ static int add_dummy_ksym_var(struct btf *btf) const struct btf_var_secinfo *vs; const struct btf_type *sec; + if (!btf) + return 0; + sec_btf_id = btf__find_by_name_kind(btf, KSYMS_SEC, BTF_KIND_DATASEC); if (sec_btf_id < 0) diff --git a/tools/lib/bpf/libbpf_internal.h b/tools/lib/bpf/libbpf_internal.h index 55d9b4dca64f..a2cc297edb99 100644 --- a/tools/lib/bpf/libbpf_internal.h +++ b/tools/lib/bpf/libbpf_internal.h @@ -41,6 +41,11 @@ #define ELF_C_READ_MMAP ELF_C_READ #endif +/* Older libelf all end up in this expression, for both 32 and 64 bit */ +#ifndef GELF_ST_VISIBILITY +#define GELF_ST_VISIBILITY(o) ((o) & 0x03) +#endif + #define BTF_INFO_ENC(kind, kind_flag, vlen) \ ((!!(kind_flag) << 31) | ((kind) << 24) | ((vlen) & BTF_MAX_VLEN)) #define BTF_TYPE_ENC(name, info, size_or_type) (name), (info), (size_or_type) |