Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753252AbbGJIO2 (ORCPT ); Fri, 10 Jul 2015 04:14:28 -0400 Received: from terminus.zytor.com ([198.137.202.10]:47714 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753557AbbGJIOG (ORCPT ); Fri, 10 Jul 2015 04:14:06 -0400 Date: Fri, 10 Jul 2015 01:13:38 -0700 From: tip-bot for Jiri Olsa Message-ID: Cc: tglx@linutronix.de, a.p.zijlstra@chello.nl, jolsa@kernel.org, linux-kernel@vger.kernel.org, jolsa@redhat.com, hpa@zytor.com, mingo@kernel.org, vlee@twopensource.com, acme@redhat.com Reply-To: jolsa@redhat.com, hpa@zytor.com, mingo@kernel.org, vlee@twopensource.com, acme@redhat.com, tglx@linutronix.de, jolsa@kernel.org, a.p.zijlstra@chello.nl, linux-kernel@vger.kernel.org In-Reply-To: <20150708111731.GA3512@krava.redhat.com> References: <20150708111731.GA3512@krava.redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf stat: Fix shadow declaration of close Git-Commit-ID: 5fc472a628edb8ad83016a063329e8b589a04060 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1925 Lines: 54 Commit-ID: 5fc472a628edb8ad83016a063329e8b589a04060 Gitweb: http://git.kernel.org/tip/5fc472a628edb8ad83016a063329e8b589a04060 Author: Jiri Olsa AuthorDate: Wed, 8 Jul 2015 13:17:31 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 8 Jul 2015 10:04:58 -0300 perf stat: Fix shadow declaration of close Vinson reported shadow declaration of close introduced by the following commit: 106a94a0f8c2 perf stat: Introduce read_counters function Using close_counters name instead. Reported-by: Vinson Lee Signed-off-by: Jiri Olsa Cc: Jiri Olsa Cc: Peter Zijlstra Fixes: 106a94a0f8c2 ("perf stat: Introduce read_counters function") Link: http://lkml.kernel.org/r/20150708111731.GA3512@krava.redhat.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-stat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index 37e301a..d99d850 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -343,7 +343,7 @@ static int read_counter(struct perf_evsel *counter) return 0; } -static void read_counters(bool close) +static void read_counters(bool close_counters) { struct perf_evsel *counter; @@ -354,7 +354,7 @@ static void read_counters(bool close) if (process_counter(counter)) pr_warning("failed to process counter %s\n", counter->name); - if (close) { + if (close_counters) { perf_evsel__close_fd(counter, perf_evsel__nr_cpus(counter), thread_map__nr(evsel_list->threads)); } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/