From: Frederic Weisbecker <fweisbec@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
linux-next@vger.kernel.org, Rusty Russell <rusty@rustcorp.com.au>
Subject: Re: linux-next: manual merge of the tracing tree with the tip-core tree
Date: Fri, 6 Mar 2009 11:41:58 +0100 [thread overview]
Message-ID: <20090306104156.GA5988@nowhere> (raw)
In-Reply-To: <20090306121740.0dc19811.sfr@canb.auug.org.au>
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.
prev parent reply other threads:[~2009-03-06 10:42 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
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=20090306104156.GA5988@nowhere \
--to=fweisbec@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=rusty@rustcorp.com.au \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/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: link
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;
as well as URLs for NNTP newsgroup(s).