1 files changed, 7 insertions, 10 deletions

diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c
index c52ac77408ca..bbd1981cc150 100644
--- a/arch/s390/net/bpf_jit_comp.c
+++ b/arch/s390/net/bpf_jit_comp.c
@@ -431,8 +431,8 @@ static int bpf_jit_insn(struct bpf_jit *jit, struct sock_filter *filter,
                 EMIT4_DISP(0x88500000, K);
                 break;
         case BPF_ALU | BPF_NEG: /* A = -A */
-                /* lnr %r5,%r5 */
-                EMIT2(0x1155);
+                /* lcr %r5,%r5 */
+                EMIT2(0x1355);
                 break;
         case BPF_JMP | BPF_JA: /* ip += K */
                 offset = addrs[i + K] + jit->start - jit->prg;
@@ -448,15 +448,12 @@ static int bpf_jit_insn(struct bpf_jit *jit, struct sock_filter *filter,
                 mask = 0x800000; /* je */
 kbranch:        /* Emit compare if the branch targets are different */
                 if (filter->jt != filter->jf) {
-                        if (K <= 16383)
-                                /* chi %r5,<K> */
-                                EMIT4_IMM(0xa75e0000, K);
-                        else if (test_facility(21))
+                        if (test_facility(21))
                                 /* clfi %r5,<K> */
                                 EMIT6_IMM(0xc25f0000, K);
                         else
-                                /* c %r5,<d(K)>(%r13) */
-                                EMIT4_DISP(0x5950d000, EMIT_CONST(K));
+                                /* cl %r5,<d(K)>(%r13) */
+                                EMIT4_DISP(0x5550d000, EMIT_CONST(K));
                 }
 branch:         if (filter->jt == filter->jf) {
                         if (filter->jt == 0)
@@ -502,8 +499,8 @@ branch:		if (filter->jt == filter->jf) {
 xbranch:        /* Emit compare if the branch targets are different */
                 if (filter->jt != filter->jf) {
                         jit->seen |= SEEN_XREG;
-                        /* cr %r5,%r12 */
-                        EMIT2(0x195c);
+                        /* clr %r5,%r12 */
+                        EMIT2(0x155c);
                 }
                 goto branch;
         case BPF_JMP | BPF_JSET | BPF_X: /* ip += (A & X) ? jt : jf */