* [PATCH] perf stat: Fix shadow declaration of close
2015-07-07 18:01 4.2-rc2 perf build error builtin-stat.c:346: error: declaration of ‘close’ shadows a global declaration Vinson Lee
@ 2015-07-08 11:17 ` Jiri Olsa
0 siblings, 0 replies; 2+ messages in thread
From: Jiri Olsa @ 2015-07-08 11:17 UTC (permalink / raw)
To: Vinson Lee
Cc: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo, Jiri Olsa,
LKML, linux-perf-users
On Tue, Jul 07, 2015 at 11:01:25AM -0700, Vinson Lee wrote:
> Hi.
>
> 4.2-rc1 commit 106a94a0f8c207ef4113ce7e32f34a00b3b174e7 "perf stat:
> Introduce read_counters function" introduced a build error with older
> toolchains.
>
> This is the build error on CentOS 6.
>
> CC builtin-stat.o
> cc1: warnings being treated as errors
> builtin-stat.c: In function ‘read_counters’:
> builtin-stat.c:346: error: declaration of ‘close’ shadows a global declaration
> /usr/include/unistd.h:350: error: shadowed declaration is here
hi,
oops, sry.. patch attached
thanks,
jirka
---
Vinson reported shadow declaration of close introduced
by following commit:
106a94a0f8c2 perf stat: Introduce read_counters function
Using close_counters name instead.
Reported-by: Vinson Lee <vlee@twopensource.com>
Link: http://lkml.kernel.org/n/tip-x4029j7ktlsxr0tnoontt4l8@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
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 de9577503ea6..2c9edd22e6e8 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -297,7 +297,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;
@@ -308,7 +308,7 @@ static void read_counters(bool close)
if (perf_stat_process_counter(&stat_config, 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));
}
--
2.4.3
^ permalink raw reply related [flat|nested] 2+ messages in thread