From b720028c2f21867879dea8eb0b787e3fc2c84b39 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Mon, 24 Sep 2012 08:31:35 +0200
Subject: [PATCH] --- yaml --- r: 324119 b: refs/heads/master c:
 c59eed111bff70bbb8c85abc73374d4da0848c79 h: refs/heads/master i:   324117:
 d50e6d2f5f6697f5086470d1339b1933a7302453   324115:
 0fcab289e1134d4208fef05147b99dc500f0b600   324111:
 9f3ae9f5f1fbeb0e4917aba65e6cefc78b8707c3 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/s390/net/bpf_jit_comp.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

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,<d(K)>(%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) */