From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Tejun Heo <tj@kernel•org>, Rusty Russell <rusty@rustcorp•com.au>,
Christoph Lameter <cl@linux-foundation•org>,
Ingo Molnar <mingo@elte•hu>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Jiri Kosina <jkosina@suse•cz>
Subject: linux-next: manual merge of the percpu tree with Linus' tree
Date: Fri, 30 Oct 2009 19:20:50 +1100 [thread overview]
Message-ID: <20091030192050.06a0f706.sfr@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the percpu tree got a conflict in mm/percpu.c
between commit 403a91b1659cb149dbddc5885f892734ae4542d8 ("percpu: allow
pcpu_alloc() to be called with IRQs off") from Linus' tree and commit
0f5e4816dbf38ce9488e611ca2296925c1e90d5e ("percpu: remove some sparse
warnings") from the percpu tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc mm/percpu.c
index d907971,e2e80fc..0000000
--- a/mm/percpu.c
+++ b/mm/percpu.c
@@@ -369,7 -364,8 +367,8 @@@ static struct pcpu_chunk *pcpu_chunk_ad
* RETURNS:
* 0 if noop, 1 if successfully extended, -errno on failure.
*/
-static int pcpu_extend_area_map(struct pcpu_chunk *chunk)
+static int pcpu_extend_area_map(struct pcpu_chunk *chunk, unsigned long *flags)
+ __releases(lock) __acquires(lock)
{
int new_alloc;
int *new;
next reply other threads:[~2009-10-30 8:20 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-30 8:20 Stephen Rothwell [this message]
2009-10-30 10:02 ` linux-next: manual merge of the percpu tree with Linus' tree Tejun Heo
2009-10-31 4:23 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2009-09-07 8:22 Stephen Rothwell
2009-09-07 8:36 ` Tejun Heo
2009-09-07 10:24 ` Stephen Rothwell
2009-07-01 7:25 Stephen Rothwell
2009-07-01 7:19 Stephen Rothwell
2009-06-29 5:33 Stephen Rothwell
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=20091030192050.06a0f706.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=cl@linux-foundation$(echo .)org \
--cc=jkosina@suse$(echo .)cz \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=rusty@rustcorp$(echo .)com.au \
--cc=tj@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox