diff options
| author | David S. Miller <davem@davemloft.net> | 2019-04-22 21:35:55 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-04-22 21:35:55 -0700 |
| commit | 2843ba2ec75948e274d2c4f0a9390980e68a6461 (patch) | |
| tree | b2fde70246956609ac43ad62026a4fdb48e33fbc /drivers | |
| parent | be659b8d3c79afc54e087ebf8d849685d7b0d395 (diff) | |
| parent | f79b464fd6b56b6256de43bc4c7d5968c0e52968 (diff) | |
| download | linux-rpi-2843ba2ec75948e274d2c4f0a9390980e68a6461.tar.gz linux-rpi-2843ba2ec75948e274d2c4f0a9390980e68a6461.tar.bz2 linux-rpi-2843ba2ec75948e274d2c4f0a9390980e68a6461.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
Alexei Starovoitov says:
====================
pull-request: bpf-next 2019-04-22
The following pull-request contains BPF updates for your *net-next* tree.
The main changes are:
1) allow stack/queue helpers from more bpf program types, from Alban.
2) allow parallel verification of root bpf programs, from Alexei.
3) introduce bpf sysctl hook for trusted root cases, from Andrey.
4) recognize var/datasec in btf deduplication, from Andrii.
5) cpumap performance optimizations, from Jesper.
6) verifier prep for alu32 optimization, from Jiong.
7) libbpf xsk cleanup, from Magnus.
8) other various fixes and cleanups.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/rc/bpf-lirc.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/media/rc/bpf-lirc.c b/drivers/media/rc/bpf-lirc.c index 390a722e6211..ee657003c1a1 100644 --- a/drivers/media/rc/bpf-lirc.c +++ b/drivers/media/rc/bpf-lirc.c @@ -97,6 +97,12 @@ lirc_mode2_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) return &bpf_map_update_elem_proto; case BPF_FUNC_map_delete_elem: return &bpf_map_delete_elem_proto; + case BPF_FUNC_map_push_elem: + return &bpf_map_push_elem_proto; + case BPF_FUNC_map_pop_elem: + return &bpf_map_pop_elem_proto; + case BPF_FUNC_map_peek_elem: + return &bpf_map_peek_elem_proto; case BPF_FUNC_ktime_get_ns: return &bpf_ktime_get_ns_proto; case BPF_FUNC_tail_call: |