From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754473AbcBPH5M (ORCPT ); Tue, 16 Feb 2016 02:57:12 -0500 Received: from terminus.zytor.com ([198.137.202.10]:40766 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754345AbcBPH5I (ORCPT ); Tue, 16 Feb 2016 02:57:08 -0500 Date: Mon, 15 Feb 2016 23:55:59 -0800 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: tglx@linutronix.de, namhyung@kernel.org, vlee@freedesktop.org, brendan.d.gregg@gmail.com, daniel@iogearbox.net, ast@kernel.org, hekuang@huawei.com, acme@redhat.com, will.deacon@arm.com, wangnan0@huawei.com, peterz@infradead.org, lizefan@huawei.com, hpa@zytor.com, mingo@kernel.org, masami.hiramatsu.pt@hitachi.com, linux-kernel@vger.kernel.org Reply-To: tglx@linutronix.de, namhyung@kernel.org, vlee@freedesktop.org, brendan.d.gregg@gmail.com, daniel@iogearbox.net, ast@kernel.org, hekuang@huawei.com, acme@redhat.com, will.deacon@arm.com, peterz@infradead.org, wangnan0@huawei.com, lizefan@huawei.com, hpa@zytor.com, mingo@kernel.org, masami.hiramatsu.pt@hitachi.com, linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tests: Fix build on older systems where ' signal' is reserved Git-Commit-ID: 1ad826bad5bd0b6ccfb203f78c70302b764df0be 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 Commit-ID: 1ad826bad5bd0b6ccfb203f78c70302b764df0be Gitweb: http://git.kernel.org/tip/1ad826bad5bd0b6ccfb203f78c70302b764df0be Author: Arnaldo Carvalho de Melo AuthorDate: Fri, 12 Feb 2016 18:30:01 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 15 Feb 2016 17:33:26 -0300 perf tests: Fix build on older systems where 'signal' is reserved fixing the following problems, for instance, on RHEL6.7: CC /tmp/build/perf/tests/bp_signal.o cc1: warnings being treated as errors tests/bp_signal.c: In function ‘__event’: tests/bp_signal.c:106: error: declaration of ‘signal’ shadows a global declaration /usr/include/signal.h:101: error: shadowed declaration is here tests/bp_signal.c: In function ‘bp_event’: tests/bp_signal.c:144: error: declaration of ‘signal’ shadows a global declaration /usr/include/signal.h:101: error: shadowed declaration is here tests/bp_signal.c: In function ‘wp_event’: tests/bp_signal.c:149: error: declaration of ‘signal’ shadows a global declaration /usr/include/signal.h:101: error: shadowed declaration is here mv: cannot stat `/tmp/build/perf/tests/.bp_signal.o.tmp': No such file or directory make[3]: *** [/tmp/build/perf/tests/bp_signal.o] Error 1 make[2]: *** [tests] Error 2 make[1]: *** [/tmp/build/perf/perf-in.o] Error 2 make[1]: *** Waiting for unfinished jobs.... Reported-by: Vinson Lee Cc: Alexei Starovoitov Cc: Brendan Gregg Cc: Daniel Borkmann Cc: He Kuang Cc: Li Zefan Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Wang Nan Cc: Will Deacon Cc: pi3orama@163.com Fixes: 8fd34e1cce18 ("perf test: Improve bp_signal") Link: http://lkml.kernel.org/n/tip-wlpx6tik1b0jirlkw64bv400@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/tests/bp_signal.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/perf/tests/bp_signal.c b/tools/perf/tests/bp_signal.c index 1d1bb48..e7664fe 100644 --- a/tools/perf/tests/bp_signal.c +++ b/tools/perf/tests/bp_signal.c @@ -103,7 +103,7 @@ static void sig_handler(int signum __maybe_unused, } } -static int __event(bool is_x, void *addr, int signal) +static int __event(bool is_x, void *addr, int sig) { struct perf_event_attr pe; int fd; @@ -133,7 +133,7 @@ static int __event(bool is_x, void *addr, int signal) } fcntl(fd, F_SETFL, O_RDWR|O_NONBLOCK|O_ASYNC); - fcntl(fd, F_SETSIG, signal); + fcntl(fd, F_SETSIG, sig); fcntl(fd, F_SETOWN, getpid()); ioctl(fd, PERF_EVENT_IOC_RESET, 0); @@ -141,14 +141,14 @@ static int __event(bool is_x, void *addr, int signal) return fd; } -static int bp_event(void *addr, int signal) +static int bp_event(void *addr, int sig) { - return __event(true, addr, signal); + return __event(true, addr, sig); } -static int wp_event(void *addr, int signal) +static int wp_event(void *addr, int sig) { - return __event(false, addr, signal); + return __event(false, addr, sig); } static long long bp_count(int fd)