From 7518995714a36fdf27c7195f1bacf70c35a7965a Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Sat, 1 Dec 2012 12:42:32 +0100 Subject: [PATCH] --- yaml --- r: 343410 b: refs/heads/master c: 916908df244fe53cc81d560ebaa9e2d11f1cee43 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/s390/net/bpf_jit_comp.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 968a422c3fb2..b85f24ec7532 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3247274536729b6cc23208cc087e50fdef3de6ba +refs/heads/master: 916908df244fe53cc81d560ebaa9e2d11f1cee43 diff --git a/trunk/arch/s390/net/bpf_jit_comp.c b/trunk/arch/s390/net/bpf_jit_comp.c index 1ff930167348..bb284419b0fd 100644 --- a/trunk/arch/s390/net/bpf_jit_comp.c +++ b/trunk/arch/s390/net/bpf_jit_comp.c @@ -389,10 +389,17 @@ static int bpf_jit_insn(struct bpf_jit *jit, struct sock_filter *filter, EMIT4_DISP(0x5650d000, EMIT_CONST(K)); break; case BPF_S_ANC_ALU_XOR_X: /* A ^= X; */ + case BPF_S_ALU_XOR_X: jit->seen |= SEEN_XREG; /* xr %r5,%r12 */ EMIT2(0x175c); break; + case BPF_S_ALU_XOR_K: /* A ^= K */ + if (!K) + break; + /* x %r5,(%r13) */ + EMIT4_DISP(0x5750d000, EMIT_CONST(K)); + break; case BPF_S_ALU_LSH_X: /* A <<= X; */ jit->seen |= SEEN_XREG; /* sll %r5,0(%r12) */