Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	drivers/net/ethernet/amd/xgbe/xgbe-desc.c
	drivers/net/ethernet/renesas/sh_eth.c

Overlapping changes in both conflict cases.

Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 8 insertions, 10 deletions

diff --git a/arch/mips/net/bpf_jit.c b/arch/mips/net/bpf_jit.c
index 9b55143d19db..9fd6834a2172 100644
--- a/arch/mips/net/bpf_jit.c
+++ b/arch/mips/net/bpf_jit.c
@@ -426,7 +426,7 @@ static inline void emit_mod(unsigned int dst, unsigned int src,
                 u32 *p = &ctx->target[ctx->idx];
                 uasm_i_divu(&p, dst, src);
                 p = &ctx->target[ctx->idx + 1];
-                uasm_i_mflo(&p, dst);
+                uasm_i_mfhi(&p, dst);
         }
         ctx->idx += 2; /* 2 insts */
 }
@@ -971,7 +971,7 @@ load_ind:
                         break;
                 case BPF_ALU | BPF_MOD | BPF_K:
                         /* A %= k */
-                        if (k == 1 || optimize_div(&k)) {
+                        if (k == 1) {
                                 ctx->flags |= SEEN_A;
                                 emit_jit_reg_move(r_A, r_zero, ctx);
                         } else {
diff --git a/arch/s390/kernel/nmi.c b/arch/s390/kernel/nmi.c
index dd1c24ceda50..3f51cf4e8f02 100644
--- a/arch/s390/kernel/nmi.c
+++ b/arch/s390/kernel/nmi.c
@@ -54,12 +54,8 @@ void s390_handle_mcck(void)
          */
         local_irq_save(flags);
         local_mcck_disable();
-        /*
-         * Ummm... Does this make sense at all? Copying the percpu struct
-         * and then zapping it one statement later?
-         */
-        memcpy(&mcck, this_cpu_ptr(&cpu_mcck), sizeof(mcck));
-        memset(&mcck, 0, sizeof(struct mcck_struct));
+        mcck = *this_cpu_ptr(&cpu_mcck);
+        memset(this_cpu_ptr(&cpu_mcck), 0, sizeof(mcck));
         clear_cpu_flag(CIF_MCCK_PENDING);
         local_mcck_enable();
         local_irq_restore(flags);
diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
index 626e01377a01..987514396c1e 100644
--- a/arch/x86/net/bpf_jit_comp.c
+++ b/arch/x86/net/bpf_jit_comp.c
@@ -178,7 +178,7 @@ static void jit_fill_hole(void *area, unsigned int size)
 }
 
 struct jit_context {
-        unsigned int cleanup_addr; /* epilogue code offset */
+        int cleanup_addr; /* epilogue code offset */
         bool seen_ld_abs;
 };
 
@@ -192,6 +192,7 @@ static int do_jit(struct bpf_prog *bpf_prog, int *addrs, u8 *image,
         struct bpf_insn *insn = bpf_prog->insnsi;
         int insn_cnt = bpf_prog->len;
         bool seen_ld_abs = ctx->seen_ld_abs | (oldproglen == 0);
+        bool seen_exit = false;
         u8 temp[BPF_MAX_INSN_SIZE + BPF_INSN_SAFETY];
         int i;
         int proglen = 0;
@@ -854,10 +855,11 @@ common_load:
                         goto common_load;
 
                 case BPF_JMP | BPF_EXIT:
-                        if (i != insn_cnt - 1) {
+                        if (seen_exit) {
                                 jmp_offset = ctx->cleanup_addr - addrs[i];
                                 goto emit_jmp;
                         }
+                        seen_exit = true;
                         /* update cleanup_addr */
                         ctx->cleanup_addr = proglen;
                         /* mov rbx, qword ptr [rbp-X] */