* linux-next: manual merge of the tracing tree with the tip-core tree
@ 2009-03-06 1:17 Stephen Rothwell
2009-03-06 10:41 ` Frederic Weisbecker
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2009-03-06 1:17 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin
Cc: linux-next, Rusty Russell, Frederic Weisbecker
Hi all,
Today's linux-next merge of the tracing tree got a conflict in
block/blktrace.c between commit 313e458f81ec3852106c5a83830fe0d4f405a71a
("alloc_percpu: add align argument to __alloc_percpu") from the tip-core
tree and commit 2db270a80b8f2238e536876cfb3987af02684df8
("tracing/blktrace: move the tracing file to kernel/trace") from the
tracing tree.
I applied the block/blktrace.c part of the former commit to
kernel/trace/blktrace.c (see below) and can carry this fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index e39679a..d24a10b 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -423,7 +423,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
if (!bt->sequence)
goto err;
- bt->msg_data = __alloc_percpu(BLK_TN_MAX_MSG);
+ bt->msg_data = __alloc_percpu(BLK_TN_MAX_MSG, __alignof__(char));
if (!bt->msg_data)
goto err;
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the tracing tree with the tip-core tree
2009-03-06 1:17 linux-next: manual merge of the tracing tree with the tip-core tree Stephen Rothwell
@ 2009-03-06 10:41 ` Frederic Weisbecker
0 siblings, 0 replies; 2+ messages in thread
From: Frederic Weisbecker @ 2009-03-06 10:41 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, linux-next,
Rusty Russell
On Fri, Mar 06, 2009 at 12:17:40PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tracing tree got a conflict in
> block/blktrace.c between commit 313e458f81ec3852106c5a83830fe0d4f405a71a
> ("alloc_percpu: add align argument to __alloc_percpu") from the tip-core
> tree and commit 2db270a80b8f2238e536876cfb3987af02684df8
> ("tracing/blktrace: move the tracing file to kernel/trace") from the
> tracing tree.
>
> I applied the block/blktrace.c part of the former commit to
> kernel/trace/blktrace.c (see below) and can carry this fix as necessary.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
>
> diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
> index e39679a..d24a10b 100644
> --- a/kernel/trace/blktrace.c
> +++ b/kernel/trace/blktrace.c
> @@ -423,7 +423,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
> if (!bt->sequence)
> goto err;
>
> - bt->msg_data = __alloc_percpu(BLK_TN_MAX_MSG);
> + bt->msg_data = __alloc_percpu(BLK_TN_MAX_MSG, __alignof__(char));
> if (!bt->msg_data)
> goto err;
>
Hi,
It looks like this problem is solved on tip/master.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-03-06 10:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-03-06 1:17 linux-next: manual merge of the tracing tree with the tip-core tree Stephen Rothwell
2009-03-06 10:41 ` Frederic Weisbecker
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).