From: Stephen Rothwell <sfr@canb.auug.org.au> To: Andrew Morton <akpm@linux-foundation.org> Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Daniel Borkmann <dborkman@redhat.com>, David Miller <davem@davemloft.net>, <netdev@vger.kernel.org>, Nicolas Schichan <nschichan@freebox.fr> Subject: linux-next: manual merge of the akpm tree with the net-next tree Date: Tue, 21 May 2013 14:25:37 +1000 [thread overview] Message-ID: <20130521142537.00a9ccb7ca4aa81f553b61cf@canb.auug.org.au> (raw) [-- Attachment #1: Type: text/plain, Size: 1391 bytes --] Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in arch/arm/net/bpf_jit_32.c between commit aafc787e41fd ("arm: bpf_jit: can call module_free() from any context") from the net-next tree and commit "ARM: net: bpf_jit: make code generation less dependent on struct sk_filter" from the akpm tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc arch/arm/net/bpf_jit_32.c index f50d223,2dab3e6..0000000 --- a/arch/arm/net/bpf_jit_32.c +++ b/arch/arm/net/bpf_jit_32.c @@@ -926,8 -926,32 +925,21 @@@ out return; } + void bpf_jit_compile(struct sk_filter *fp) + { + struct jit_ctx ctx; + + memset(&ctx, 0, sizeof(ctx)); + ctx.prog_len = fp->len; + ctx.prog_insns = fp->insns; + + __bpf_jit_compile(&ctx); + if (ctx.target) + fp->bpf_func = (void *)ctx.target; + } + -static void bpf_jit_free_worker(struct work_struct *work) -{ - module_free(NULL, work); -} - void bpf_jit_free(struct sk_filter *fp) { - struct work_struct *work; - - if (fp->bpf_func != sk_run_filter) { - work = (struct work_struct *)fp->bpf_func; - - INIT_WORK(work, bpf_jit_free_worker); - schedule_work(work); - } + if (fp->bpf_func != sk_run_filter) + module_free(NULL, fp->bpf_func); } [-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au> To: Andrew Morton <akpm@linux-foundation.org> Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Daniel Borkmann <dborkman@redhat.com>, David Miller <davem@davemloft.net>, netdev@vger.kernel.org, Nicolas Schichan <nschichan@freebox.fr> Subject: linux-next: manual merge of the akpm tree with the net-next tree Date: Tue, 21 May 2013 14:25:37 +1000 [thread overview] Message-ID: <20130521142537.00a9ccb7ca4aa81f553b61cf@canb.auug.org.au> (raw) [-- Attachment #1: Type: text/plain, Size: 1391 bytes --] Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in arch/arm/net/bpf_jit_32.c between commit aafc787e41fd ("arm: bpf_jit: can call module_free() from any context") from the net-next tree and commit "ARM: net: bpf_jit: make code generation less dependent on struct sk_filter" from the akpm tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc arch/arm/net/bpf_jit_32.c index f50d223,2dab3e6..0000000 --- a/arch/arm/net/bpf_jit_32.c +++ b/arch/arm/net/bpf_jit_32.c @@@ -926,8 -926,32 +925,21 @@@ out return; } + void bpf_jit_compile(struct sk_filter *fp) + { + struct jit_ctx ctx; + + memset(&ctx, 0, sizeof(ctx)); + ctx.prog_len = fp->len; + ctx.prog_insns = fp->insns; + + __bpf_jit_compile(&ctx); + if (ctx.target) + fp->bpf_func = (void *)ctx.target; + } + -static void bpf_jit_free_worker(struct work_struct *work) -{ - module_free(NULL, work); -} - void bpf_jit_free(struct sk_filter *fp) { - struct work_struct *work; - - if (fp->bpf_func != sk_run_filter) { - work = (struct work_struct *)fp->bpf_func; - - INIT_WORK(work, bpf_jit_free_worker); - schedule_work(work); - } + if (fp->bpf_func != sk_run_filter) + module_free(NULL, fp->bpf_func); } [-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-05-21 4:25 UTC|newest] Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-05-21 4:25 Stephen Rothwell [this message] 2013-05-21 4:25 ` linux-next: manual merge of the akpm tree with the net-next tree Stephen Rothwell 2013-05-21 7:44 ` Daniel Borkmann 2013-05-21 23:54 ` Stephen Rothwell 2013-05-22 9:20 ` Daniel Borkmann -- strict thread matches above, loose matches on Subject: below -- 2020-06-02 9:30 Stephen Rothwell 2020-06-02 9:45 ` Stephen Rothwell 2019-07-03 10:49 Stephen Rothwell 2018-01-16 4:51 Stephen Rothwell 2017-03-20 5:10 Stephen Rothwell 2017-02-07 5:23 Stephen Rothwell 2017-02-07 8:40 ` Marc Kleine-Budde 2017-02-07 9:45 ` Stephen Rothwell 2015-05-14 7:39 Stephen Rothwell 2015-05-14 7:39 ` Stephen Rothwell 2015-05-14 7:38 Stephen Rothwell 2015-05-14 7:38 ` Stephen Rothwell 2014-07-23 8:18 Stephen Rothwell 2014-07-23 8:18 ` Stephen Rothwell 2013-11-06 9:00 Stephen Rothwell 2013-11-06 9:00 ` Stephen Rothwell 2013-11-06 8:55 Stephen Rothwell 2013-11-06 8:55 ` Stephen Rothwell 2013-05-21 4:32 Stephen Rothwell 2013-05-21 4:32 ` Stephen Rothwell 2013-05-21 4:29 Stephen Rothwell 2013-05-21 4:29 ` Stephen Rothwell 2013-05-21 20:04 ` Andrew Morton 2013-05-21 20:04 ` Andrew Morton 2013-05-22 7:07 ` David Miller 2013-05-22 7:14 ` Andrew Morton 2013-05-22 7:19 ` David Miller 2013-05-22 7:48 ` Daniel Borkmann 2013-05-20 4:14 Stephen Rothwell 2013-05-20 4:14 ` Stephen Rothwell 2013-05-20 4:11 Stephen Rothwell 2013-05-20 4:11 ` Stephen Rothwell 2013-02-20 6:02 Stephen Rothwell 2013-02-20 6:02 ` Stephen Rothwell 2013-02-20 6:43 ` Cong Wang 2013-02-15 6:56 Stephen Rothwell 2013-02-15 6:56 ` Stephen Rothwell 2012-06-08 3:56 Stephen Rothwell 2012-06-08 3:56 ` Stephen Rothwell 2011-11-23 3:27 Stephen Rothwell 2011-11-23 3:27 ` Stephen Rothwell 2011-11-23 3:40 ` Neil Horman
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20130521142537.00a9ccb7ca4aa81f553b61cf@canb.auug.org.au \ --to=sfr@canb.auug.org.au \ --cc=akpm@linux-foundation.org \ --cc=davem@davemloft.net \ --cc=dborkman@redhat.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-next@vger.kernel.org \ --cc=netdev@vger.kernel.org \ --cc=nschichan@freebox.fr \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.