Re: [PATCH] [perf/core branch] perf coresight: Fix ARM builds caused by misplaced __printf
From: Kim Phillips
Date: Mon Jun 19 2017 - 16:29:37 EST
On Mon, 19 Jun 2017 16:52:22 -0300
Arnaldo Carvalho de Melo <acme@xxxxxxxxxx> wrote:
> Em Mon, Jun 19, 2017 at 02:26:33PM -0500, Kim Phillips escreveu:
> > On Mon, 19 Jun 2017 15:42:09 -0300
> > Arnaldo Carvalho de Melo <acme@xxxxxxxxxx> wrote:
> >
> > > Em Mon, Jun 19, 2017 at 11:51:20AM -0600, Mathieu Poirier escreveu:
> > > > On 16 June 2017 at 13:59, Kim Phillips <kim.phillips@xxxxxxx> wrote:
> > > > > -static int cs_device__print_file(const char *name, const char *fmt, ...) __printf(2, 3)
> > > > > +static int __printf(2, 3) cs_device__print_file(const char *name, const char *fmt, ...)
> > > > > {
> > > > > va_list args;
> > > > > FILE *file;
> > > >
> > > > I just tested Kim's solution on my side.
> > > >
> > > > Acked-by: Mathieu Poirier <mathieu.poirier@xxxxxxxxxx>
> > >
> > > Thanks for checking, since I haven't pushed this to Ingo I just squashed
> > > Kim's fix into the buggy cset.
> > >
> > > Now I'm trying to build it with lots of cross build containers to see if
> > > there are any other problems before push this up to Ingo.
> >
> > Thanks, I'm still trying to learn the submission process...
> >
> > Slightly off-topic, but when you push kernel.org/.../acme/linux.git, do
> > you push --tags?
>
> I usually just do:
>
> git push acme.korg perf/urgent
>
> or
>
> git push acme.korg perf/urgent
>
> [acme@jouet linux]$ git remote -v | grep korg
> acme.korg gitolite@xxxxxxxxxxxxxxxxxxx:/pub/scm/linux/kernel/git/acme/linux.git (fetch)
> acme.korg gitolite@xxxxxxxxxxxxxxxxxxx:/pub/scm/linux/kernel/git/acme/linux.git (push)
> [acme@jouet linux]$
>
> Or some other branch, acme/master isn't updated. I guess I should do
> like tip/master, and always have acme/master with acme/perf/core merged
> with acme/perf/urgent, but for now, just consider acme/perf/urgent and
> acme/perf/core.
I'm not particularly concerned about the master branch being
up-to-date, I'm more concerned about the repo's tags being up to date,
so perf --version will work correctly.
If you don't mind publishing all your local tags, and you don't want to
'push --tags' every time, adding this line to acme.korg's remote config
section will do it automatically:
push = +refs/tags/*
Thanks,
Kim
>
> > If I do a fresh clone, checkout perf/core or urgent, build perf,
> > PERF-VERSION-GEN first uses git to find the version number, then the
> > Makefile. But in acme/linux.git, the latest version tag looks to match
> > the master branch version: 3.2: so I get a 3.2-reporting version on
> > what should be 4.12-rc4 (perf/core's current Makefile):
> >
> > $ tools/perf/perf --version
> > perf version 3.2.gd15e591
> >
> > Is this an acme/linux.git tree maintenance issue, or should
> > PERF-VERSION-GEN be modified to compare versions gotten from git vs.
> > the Makefile, and just use the higher one?
> >
> > Thanks,
> >
> > Kim