From: Mike Turquette <mturquette@linaro.org>
To: Geert Uytterhoeven <geert@linux-m68k.org>,
Stephen Boyd <sboyd@codeaurora.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Linux-Next <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the clk tree
Date: Wed, 04 Mar 2015 16:15:03 -0800 [thread overview]
Message-ID: <20150305001503.11109.69241@quantum> (raw)
In-Reply-To: <CAMuHMdWyWCa3bA4Z_4mnyqL-7kJ_de8UiRGiwR6U1-QDjwEcQQ@mail.gmail.com>
Quoting Geert Uytterhoeven (2015-03-04 01:56:42)
> On Fri, Feb 27, 2015 at 6:42 PM, Stephen Boyd <sboyd@codeaurora.org> wrote:
> > The problem is the patch was written before struct clk_core moved into
> > the clk.c file and then applied after it moved. So before the move the
> > order of includes would cause the struct definition to be before the
> > place where the tracepoint macros were expanded. The fix is to move the
> > tracepoint include after the struct clk_core definition:
> >
> > -----8<----
> >
> > diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
> > index 9aee501b8284..392477033990 100644
> > --- a/drivers/clk/clk.c
> > +++ b/drivers/clk/clk.c
> > @@ -22,9 +22,6 @@
> > #include <linux/init.h>
> > #include <linux/sched.h>
> >
> > -#define CREATE_TRACE_POINTS
> > -#include <trace/events/clk.h>
> > -
> > #include "clk.h"
> >
> > static DEFINE_SPINLOCK(enable_lock);
> > @@ -80,6 +77,9 @@ struct clk_core {
> > struct kref ref;
> > };
> >
> > +#define CREATE_TRACE_POINTS
> > +#include <trace/events/clk.h>
> > +
> > struct clk {
> > struct clk_core *core;
> > const char *dev_id;
>
> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Thanks, I've rolled this into the offending commit.
Regards,
Mike
>
> Gr{oetje,eeting}s,
>
> Geert
>
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
>
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like that.
> -- Linus Torvalds
next prev parent reply other threads:[~2015-03-05 0:15 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-27 3:08 linux-next: build failure after merge of the clk tree Stephen Rothwell
2015-02-27 17:42 ` Stephen Boyd
2015-03-04 9:56 ` Geert Uytterhoeven
2015-03-05 0:15 ` Mike Turquette [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-01-03 23:04 Stephen Rothwell
2024-01-04 0:59 ` Stephen Boyd
2023-04-02 23:59 Stephen Rothwell
2023-04-05 0:28 ` Stephen Rothwell
2020-05-11 0:55 Stephen Rothwell
2020-05-13 3:20 ` Stephen Boyd
2020-05-13 3:28 ` Stephen Boyd
2020-01-07 21:47 Stephen Rothwell
2019-07-02 0:01 Stephen Rothwell
2019-07-02 1:14 ` Stephen Rothwell
2019-07-02 2:03 ` Stephen Rothwell
2019-07-05 1:24 ` Stephen Rothwell
2019-07-12 17:53 ` Stephen Boyd
2019-05-02 23:25 Stephen Rothwell
2019-05-03 15:55 ` Stephen Boyd
2018-11-29 22:03 Stephen Rothwell
2018-01-01 21:51 Stephen Rothwell
2018-01-02 19:58 ` Stephen Boyd
2017-12-10 23:16 Stephen Rothwell
2017-12-14 0:57 ` Stephen Boyd
2017-06-05 0:14 Stephen Rothwell
2015-08-12 7:19 Stephen Rothwell
2015-08-12 7:45 ` Geert Uytterhoeven
2015-08-12 8:23 ` Stephen Boyd
2015-08-12 8:03 ` Stephen Boyd
2015-07-27 4:11 Stephen Rothwell
2015-08-03 10:08 ` Tony Lindgren
2015-08-07 23:56 ` Stephen Boyd
2015-08-13 11:04 ` Olof Johansson
2015-02-26 2:14 Stephen Rothwell
2015-02-26 9:09 ` Krzysztof Kozlowski
2015-02-27 0:01 ` Mike Turquette
2015-02-27 0:06 ` Stephen Rothwell
2014-12-16 3:45 Stephen Rothwell
[not found] ` <20141216072034.29014.12434@quantum>
2014-12-17 3:47 ` Stephen Rothwell
2014-01-29 3:32 Stephen Rothwell
2014-01-29 10:02 ` Sebastian Hesselbarth
2013-04-15 5:04 Stephen Rothwell
2013-04-15 7:03 ` Sebastian Hesselbarth
2013-04-16 0:42 ` Mike Turquette
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=20150305001503.11109.69241@quantum \
--to=mturquette@linaro.org \
--cc=geert@linux-m68k.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sboyd@codeaurora.org \
--cc=sfr@canb.auug.org.au \
/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).