diff options
| author | David S. Miller <davem@davemloft.net> | 2019-12-12 05:13:45 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-12-12 05:13:45 +0100 |
| commit | 148709bc278a2e49ff7b10cee2d8cdc33b894598 (patch) | |
| tree | c27a039d9886cae1572f81d80e35af60bf9cd740 /kernel/bpf/btf.c | |
| parent | net: ena: fix napi handler misbehavior when the napi budget is zero (diff) | |
| parent | samples: bpf: fix syscall_tp due to unused syscall (diff) | |
| download | linux-148709bc278a2e49ff7b10cee2d8cdc33b894598.tar.xz linux-148709bc278a2e49ff7b10cee2d8cdc33b894598.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Alexei Starovoitov says:
====================
pull-request: bpf 2019-12-11
The following pull-request contains BPF updates for your *net* tree.
We've added 8 non-merge commits during the last 1 day(s) which contain
a total of 10 files changed, 126 insertions(+), 18 deletions(-).
The main changes are:
1) Make BPF trampoline co-exist with ftrace-based tracers, from Alexei.
2) Fix build in minimal configurations, from Arnd.
3) Fix mips, riscv bpf_tail_call limit, from Paul.
4) Fix bpftool segfault, from Toke.
5) Fix samples/bpf, from Daniel.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/bpf/btf.c')
| -rw-r--r-- | kernel/bpf/btf.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c index 7d40da240891..ed2075884724 100644 --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c @@ -3470,6 +3470,7 @@ static u8 bpf_ctx_convert_map[] = { [_id] = __ctx_convert##_id, #include <linux/bpf_types.h> #undef BPF_PROG_TYPE + 0, /* avoid empty array */ }; #undef BPF_MAP_TYPE |