diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-04-13 16:04:28 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-04-13 16:04:28 -0700 |
| commit | 800e68c44ffe71f9715f745b38fd1af6910b3773 (patch) | |
| tree | 898caef9a109e429776e65c1083d1503207bebed /arch/loongarch | |
| parent | 4033eaa68af6e3e9a8ec3819a9369d29aee8a2c4 (diff) | |
| parent | 829cca4d1783088e43bace57a555044cc937c554 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflicts:
tools/testing/selftests/net/config
62199e3f1658 ("selftests: net: Add VXLAN MDB test")
3a0385be133e ("selftests: add the missing CONFIG_IP_SCTP in net config")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'arch/loongarch')
| -rw-r--r-- | arch/loongarch/net/bpf_jit.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/loongarch/net/bpf_jit.c b/arch/loongarch/net/bpf_jit.c index e70c846efaa1..db9342b2d0e6 100644 --- a/arch/loongarch/net/bpf_jit.c +++ b/arch/loongarch/net/bpf_jit.c @@ -1022,6 +1022,10 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx, bool ext emit_atomic(insn, ctx); break; + /* Speculation barrier */ + case BPF_ST | BPF_NOSPEC: + break; + default: pr_err("bpf_jit: unknown opcode %02x\n", code); return -EINVAL; |