From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Christoph Lameter <cl@linux-foundation•org>
Cc: linux-next@vger•kernel.org,
Andrew Morton <akpm@linux-foundation•org>,
Mike Travis <travis@sgi•com>, Ingo Molnar <mingo@elte•hu>
Subject: linux-next: manual merge of the cpu_alloc tree
Date: Tue, 28 Oct 2008 16:58:31 +1100 [thread overview]
Message-ID: <20081028165831.ff892db6.sfr@canb.auug.org.au> (raw)
Hi Christoph,
Today's linux-next merge of the cpu_alloc tree got a conflict in
kernel/lockdep.c between commit d3794979a8a80c222ce9d016a6dfc4bed36965d0
("Zero based percpu: infrastructure to rebase the per cpu area to zero")
from the tip-core tree and commit
67cc04164a030c715717fd70dc935a5298c4034b ("cpualloc: percpu: rename
variables PERCPU_ENOUGH_ROOM -> PERCPU_AREA_SIZE") from the cpu_alloc
tree.
Overlapping changes. I have fixed it up (see below) and can carry the fix.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc kernel/lockdep.c
index e0352c9,a91b26b..0000000
--- a/kernel/lockdep.c
+++ b/kernel/lockdep.c
@@@ -642,8 -638,8 +642,8 @@@ static int static_obj(void *obj
* percpu var?
*/
for_each_possible_cpu(i) {
- start = (unsigned long) &__per_cpu_start + per_cpu_offset(i);
- end = (unsigned long) &__per_cpu_start + PERCPU_AREA_SIZE
+ start = (unsigned long) __per_cpu_start + per_cpu_offset(i);
- end = (unsigned long) __per_cpu_start + PERCPU_ENOUGH_ROOM
++ end = (unsigned long) __per_cpu_start + PERCPU_AREA_SIZE
+ per_cpu_offset(i);
if ((addr >= start) && (addr < end))
next reply other threads:[~2008-10-28 6:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-28 5:58 Stephen Rothwell [this message]
2008-10-30 18:01 ` linux-next: manual merge of the cpu_alloc tree Christoph Lameter
-- strict thread matches above, loose matches on Subject: below --
2008-10-28 6:05 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=20081028165831.ff892db6.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=cl@linux-foundation$(echo .)org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=travis@sgi$(echo .)com \
/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