diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-05-07 09:29:16 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-05-07 09:29:16 -0700 |
| commit | 14cfbdac6680bc87f6b9f6196d4d4ec044a01481 (patch) | |
| tree | af0d50b37477808d297a0a3f0273fb44b7b1ca7a /scripts/link-vmlinux.sh | |
| parent | Merge branch 'r8169-replace-some-magic-with-more-speaking-functions' (diff) | |
| parent | libbpf: remove unnecessary cast-to-void (diff) | |
| download | linux-dev-14cfbdac6680bc87f6b9f6196d4d4ec044a01481.tar.xz linux-dev-14cfbdac6680bc87f6b9f6196d4d4ec044a01481.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
Daniel Borkmann says:
====================
pull-request: bpf-next 2019-05-06
The following pull-request contains BPF updates for your *net-next* tree.
The main changes are:
1) Two AF_XDP libbpf fixes for socket teardown; first one an invalid
munmap and the other one an invalid skmap cleanup, both from Björn.
2) More graceful CONFIG_DEBUG_INFO_BTF handling when pahole is not
present in the system to generate vmlinux btf info, from Andrii.
3) Fix libbpf and thus fix perf build error with uClibc on arc
architecture, from Vineet.
4) Fix missing libbpf_util.h header install in libbpf, from William.
5) Exclude bash-completion/bpftool from .gitignore pattern, from Masahiro.
6) Fix up rlimit in test_libbpf_open kselftest test case, from Yonghong.
7) Minor misc cleanups.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'scripts/link-vmlinux.sh')
| -rwxr-xr-x | scripts/link-vmlinux.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh index 6a148d0d51bf..e3c06b9482a2 100755 --- a/scripts/link-vmlinux.sh +++ b/scripts/link-vmlinux.sh @@ -96,6 +96,11 @@ gen_btf() { local pahole_ver; + if ! [ -x "$(command -v ${PAHOLE})" ]; then + info "BTF" "${1}: pahole (${PAHOLE}) is not available" + return 0 + fi + pahole_ver=$(${PAHOLE} --version | sed -E 's/v([0-9]+)\.([0-9]+)/\1\2/') if [ "${pahole_ver}" -lt "113" ]; then info "BTF" "${1}: pahole version $(${PAHOLE} --version) is too old, need at least v1.13" |