diff --git a/[refs] b/[refs] index 3a86a1dbf4ae..a91fb30fe6dd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 022912575ce3135517ec1cbfb8d4b240e0821feb +refs/heads/master: c59eed111bff70bbb8c85abc73374d4da0848c79 diff --git a/trunk/arch/s390/net/bpf_jit_comp.c b/trunk/arch/s390/net/bpf_jit_comp.c index f57f0c335b1d..9b355b406afa 100644 --- a/trunk/arch/s390/net/bpf_jit_comp.c +++ b/trunk/arch/s390/net/bpf_jit_comp.c @@ -367,6 +367,11 @@ static int bpf_jit_insn(struct bpf_jit *jit, struct sock_filter *filter, /* o %r5,(%r13) */ EMIT4_DISP(0x5650d000, EMIT_CONST(K)); break; + case BPF_S_ANC_ALU_XOR_X: /* A ^= X; */ + jit->seen |= SEEN_XREG; + /* xr %r5,%r12 */ + EMIT2(0x175c); + break; case BPF_S_ALU_LSH_X: /* A <<= X; */ jit->seen |= SEEN_XREG; /* sll %r5,0(%r12) */