Subject: [to-be-updated] arm-net-bpf_jit-make-code-generation-less-dependent-on-struct-sk_filter-fixup-merge-conflict.patch removed from -mm tree To: dborkman@xxxxxxxxxx,arnd@xxxxxxxx,nschichan@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Tue, 21 May 2013 13:04:47 -0700 The patch titled Subject: ARM: bpf_jit: seccomp filtering: fixup merge conflict has been removed from the -mm tree. Its filename was arm-net-bpf_jit-make-code-generation-less-dependent-on-struct-sk_filter-fixup-merge-conflict.patch This patch was dropped because an updated version will be merged ------------------------------------------------------ From: Daniel Borkmann <dborkman@xxxxxxxxxx> Subject: ARM: bpf_jit: seccomp filtering: fixup merge conflict Commit e4c67f4c0479d8e3cb0 (ARM: net: bpf_jit: make code generation less dependent on struct sk_filter.) caused a merge conflict with commit 79617801ea0c0e6 (filter: bpf_jit_comp: refactor and unify BPF JIT image dump output) resulting in a build failure: arch/arm/net/bpf_jit_32.c: In function '__bpf_jit_compile': arch/arm/net/bpf_jit_32.c:930:16: error: 'fp' undeclared (first use in this function) bpf_jit_dump(fp->len, alloc_size, 2, ctx.target); Fix this up by using ctx.prog_len that is being set before we enter __bpf_jit_compile(). Signed-off-by: Daniel Borkmann <dborkman@xxxxxxxxxx> Reported-by: Arnd Bergmann <arnd@xxxxxxxx> Cc: Nicolas Schichan <nschichan@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/arm/net/bpf_jit_32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN arch/arm/net/bpf_jit_32.c~arm-net-bpf_jit-make-code-generation-less-dependent-on-struct-sk_filter-fixup-merge-conflict arch/arm/net/bpf_jit_32.c --- a/arch/arm/net/bpf_jit_32.c~arm-net-bpf_jit-make-code-generation-less-dependent-on-struct-sk_filter-fixup-merge-conflict +++ a/arch/arm/net/bpf_jit_32.c @@ -917,7 +917,7 @@ static void __bpf_jit_compile(struct jit if (bpf_jit_enable > 1) /* there are 2 passes here */ - bpf_jit_dump(fp->len, alloc_size, 2, ctx.target); + bpf_jit_dump(ctx.prog_len, alloc_size, 2, ctx.target); out: kfree(ctx.offsets); _ Patches currently in -mm which might be from dborkman@xxxxxxxxxx are linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html