* linux-next: manual merge of the cpu_alloc tree
@ 2008-10-28 5:58 Stephen Rothwell
2008-10-30 18:01 ` Christoph Lameter
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2008-10-28 5:58 UTC (permalink / raw)
To: Christoph Lameter; +Cc: linux-next, Andrew Morton, Mike Travis, Ingo Molnar
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))
^ permalink raw reply [flat|nested] 3+ messages in thread* linux-next: manual merge of the cpu_alloc tree
@ 2008-10-28 6:05 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2008-10-28 6:05 UTC (permalink / raw)
To: Christoph Lameter
Cc: linux-next, Andrew Morton, Rusty Russell, Mike Travis,
Ingo Molnar
[-- Attachment #1: Type: text/plain, Size: 620 bytes --]
Hi Christoph,
Today's linux-next merge of the cpu_alloc tree got a conflict in
kernel/module.c between commit d3794979a8a80c222ce9d016a6dfc4bed36965d0
("Zero based percpu: infrastructure to rebase the per cpu area to zero")
from the tip-core tree and commit
3ba98730fe1feb5b3fd9747fa1d3d629cd7ec0f7 ("cpualloc: use cpu allocator
instead of the builtin modules per cpu allocator") from the cpu_alloc
tree.
The latter removed code that the former modified. I removed the code and
can carry this fix.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-10-30 18:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-10-28 5:58 linux-next: manual merge of the cpu_alloc tree Stephen Rothwell
2008-10-30 18:01 ` Christoph Lameter
-- strict thread matches above, loose matches on Subject: below --
2008-10-28 6:05 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox