From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755584Ab3EVJVH (ORCPT ); Wed, 22 May 2013 05:21:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48393 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752407Ab3EVJVE (ORCPT ); Wed, 22 May 2013 05:21:04 -0400 Message-ID: <519C8DF3.7000605@redhat.com> Date: Wed, 22 May 2013 11:20:51 +0200 From: Daniel Borkmann User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: Stephen Rothwell CC: Andrew Morton , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, David Miller , netdev@vger.kernel.org, Nicolas Schichan Subject: Re: linux-next: manual merge of the akpm tree with the net-next tree References: <20130521142537.00a9ccb7ca4aa81f553b61cf@canb.auug.org.au> <519B25CD.5060801@redhat.com> <20130522095436.66e63c613c41da01cd103208@canb.auug.org.au> In-Reply-To: <20130522095436.66e63c613c41da01cd103208@canb.auug.org.au> Content-Type: multipart/mixed; boundary="------------040407090900060402060109" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is a multi-part message in MIME format. --------------040407090900060402060109 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit On 05/22/2013 01:54 AM, Stephen Rothwell wrote: > Hi Daniel, > > On Tue, 21 May 2013 09:44:13 +0200 Daniel Borkmann wrote: >> >> Also seccomp_jit_free() needs a change otherwise the kernel won't build >> with CONFIG_SECCOMP_FILTER_JIT enabled since the work_struct is initialized >> with the bpf_jit_free_worker() callback, which is no longer existent. >> >> Do you want me to send you a patch? > > Yes, please. In case this is still needed, patch attached. That should fix it. --------------040407090900060402060109 Content-Type: text/x-patch; name="0001-arm-bpf_jit-fixup-build-error-in-seccomp_jit_free.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0001-arm-bpf_jit-fixup-build-error-in-seccomp_jit_free.patch" >>From 72d68685f31b84f64826740cf3d33ba6d8d28ffc Mon Sep 17 00:00:00 2001 Message-Id: <72d68685f31b84f64826740cf3d33ba6d8d28ffc.1369214198.git.dborkman@redhat.com> In-Reply-To: References: From: Daniel Borkmann Date: Wed, 22 May 2013 11:12:31 +0200 Subject: [PATCH] arm: bpf_jit: fixup build error in seccomp_jit_free bpf_jit_free_worker() no longer exist, so get seccomp_jit_free() in line with bpf_jit_free(). Signed-off-by: Daniel Borkmann --- arch/arm/net/bpf_jit_32.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c index 62aca35..3fe001d 100644 --- a/arch/arm/net/bpf_jit_32.c +++ b/arch/arm/net/bpf_jit_32.c @@ -969,18 +969,9 @@ void seccomp_jit_compile(struct seccomp_filter *fp) void seccomp_jit_free(struct seccomp_filter *fp) { - struct work_struct *work; void *bpf_func = seccomp_filter_get_bpf_func(fp); - if (bpf_func != sk_run_filter) { - /* - * seccomp_jit_free() can be called from softirq; module_free() - * requires process context. - */ - work = (struct work_struct *)bpf_func; - - INIT_WORK(work, bpf_jit_free_worker); - schedule_work(work); - } + if (bpf_func != sk_run_filter) + module_free(NULL, bpf_func); } #endif -- 1.7.11.7 --------------040407090900060402060109--