diff options
| author | David S. Miller <davem@davemloft.net> | 2019-04-26 08:54:42 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-04-26 08:54:42 +0300 |
| commit | ad759c906954aab1bab8b5fe04931e566d901a0e (patch) | |
| tree | e63af6ed708ed97df97b4b1b9ec16150131097e2 /arch | |
| parent | cd8dead0c39457e58ec1d36db93aedca811d48f1 (diff) | |
| parent | 0edd6b64d1939e9e9168ff27947995bb7751db5d (diff) | |
| download | linux-ad759c906954aab1bab8b5fe04931e566d901a0e.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Alexei Starovoitov says:
====================
pull-request: bpf 2019-04-25
The following pull-request contains BPF updates for your *net* tree.
The main changes are:
1) the bpf verifier fix to properly mark registers in all stack frames, from Paul.
2) preempt_enable_no_resched->preempt_enable fix, from Peter.
3) other misc fixes.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/net/ebpf_jit.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/mips/net/ebpf_jit.c b/arch/mips/net/ebpf_jit.c index 0effd3cba9a7..98bf0c222b5f 100644 --- a/arch/mips/net/ebpf_jit.c +++ b/arch/mips/net/ebpf_jit.c @@ -186,8 +186,9 @@ enum which_ebpf_reg { * separate frame pointer, so BPF_REG_10 relative accesses are * adjusted to be $sp relative. */ -int ebpf_to_mips_reg(struct jit_ctx *ctx, const struct bpf_insn *insn, - enum which_ebpf_reg w) +static int ebpf_to_mips_reg(struct jit_ctx *ctx, + const struct bpf_insn *insn, + enum which_ebpf_reg w) { int ebpf_reg = (w == src_reg || w == src_reg_no_fp) ? insn->src_reg : insn->dst_reg; |