From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752371AbdFSU3d (ORCPT ); Mon, 19 Jun 2017 16:29:33 -0400 Received: from foss.arm.com ([217.140.101.70]:57348 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751689AbdFSU3c (ORCPT ); Mon, 19 Jun 2017 16:29:32 -0400 Date: Mon, 19 Jun 2017 15:29:29 -0500 From: Kim Phillips To: Arnaldo Carvalho de Melo Cc: Mathieu Poirier , Peter Zijlstra , Ingo Molnar , Alexander Shishkin , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" Subject: Re: [PATCH] [perf/core branch] perf coresight: Fix ARM builds caused by misplaced __printf Message-Id: <20170619152929.1a3e78ae4329420d8ef7f4b6@arm.com> In-Reply-To: <20170619195222.GD13640@kernel.org> References: <20170616145907.baba73eda242efe194e072d0@arm.com> <20170619184209.GB13640@kernel.org> <20170619142633.51d138db0c0b8befa0542bf6@arm.com> <20170619195222.GD13640@kernel.org> Organization: ARM X-Mailer: Sylpheed 3.5.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 19 Jun 2017 16:52:22 -0300 Arnaldo Carvalho de Melo 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 wrote: > > > > > Em Mon, Jun 19, 2017 at 11:51:20AM -0600, Mathieu Poirier escreveu: > > > > On 16 June 2017 at 13:59, Kim Phillips 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 > > > > > > 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@gitolite.kernel.org:/pub/scm/linux/kernel/git/acme/linux.git (fetch) > acme.korg gitolite@gitolite.kernel.org:/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