diff options
| author |   David S. Miller <davem@davemloft.net> | 2018-12-15 10:58:32 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-12-15 10:58:32 -0800 |
| commit | 10589a568f2ec531975504c98c1bed88c233a63d (patch) | |
| tree | f2e986932c85bdbb5c1531fdd890b9f05664cf50 /include | |
| parent | tipc: check tsk->group in tipc_wait_for_cond() (diff) | |
| parent | bpf: verifier: make sure callees don't prune with caller differences (diff) | |
| download | linux-dev-10589a568f2ec531975504c98c1bed88c233a63d.tar.xz linux-dev-10589a568f2ec531975504c98c1bed88c233a63d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Alexei Starovoitov says:
====================
pull-request: bpf 2018-12-15
The following pull-request contains BPF updates for your *net* tree.
The main changes are:
1) fix liveness propagation of callee saved registers, from Jakub.
2) fix overflow in bpf_jit_limit knob, from Daniel.
3) bpf_flow_dissector api fix, from Stanislav.
4) bpf_perf_event api fix on powerpc, from Sandipan.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/filter.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/filter.h b/include/linux/filter.h index 795ff0b869bb..a8b9d90a8042 100644 --- a/include/linux/filter.h +++ b/include/linux/filter.h @@ -861,7 +861,7 @@ bpf_run_sk_reuseport(struct sock_reuseport *reuse, struct sock *sk, extern int bpf_jit_enable; extern int bpf_jit_harden; extern int bpf_jit_kallsyms; -extern int bpf_jit_limit; +extern long bpf_jit_limit; typedef void (*bpf_jit_fill_hole_t)(void *area, unsigned int size); |