Commit 22f10923 authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 785c20a0 69204cf7

Documentation/Changes

+1 −1
Original line number Diff line number Diff line
@@ -383,7 +383,7 @@ o <http://www.iptables.org/downloads.html> 


Ip-route2

---------

o  <ftp://ftp.tux.org/pub/net/ip-routing/iproute2-2.2.4-now-ss991023.tar.gz>

o  <https://www.kernel.org/pub/linux/utils/net/iproute2/>



OProfile

--------

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 18

SUBLEVEL = 0

EXTRAVERSION = -rc6

EXTRAVERSION = -rc7

NAME = Diseased Newt



# *DOCUMENTATION*

arch/mips/net/bpf_jit.c

+2 −2
Original line number Diff line number Diff line
@@ -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 @@ static int build_body(struct jit_ctx *ctx) 
			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 {

arch/s390/kernel/nmi.c

+2 −6
Original line number Diff line number Diff line
@@ -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);

arch/x86/net/bpf_jit_comp.c

+4 −2
Original line number Diff line number Diff line
@@ -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 @@ xadd: if (is_imm8(insn->off)) 
			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] */