From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755240AbbCXQcs (ORCPT ); Tue, 24 Mar 2015 12:32:48 -0400 Received: from terminus.zytor.com ([198.137.202.10]:56859 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752767AbbCXQco (ORCPT ); Tue, 24 Mar 2015 12:32:44 -0400 Date: Tue, 24 Mar 2015 09:32:14 -0700 From: tip-bot for Vinson Lee Message-ID: Cc: a.p.zijlstra@chello.nl, masami.hiramatsu.pt@hitachi.com, linux-kernel@vger.kernel.org, ydroneaud@opteya.com, mingo@kernel.org, namhyung@kernel.org, acme@redhat.com, hpa@zytor.com, paulus@samba.org, adrian.hunter@intel.com, jolsa@kernel.org, tglx@linutronix.de, vlee@twitter.com Reply-To: ydroneaud@opteya.com, mingo@kernel.org, a.p.zijlstra@chello.nl, masami.hiramatsu.pt@hitachi.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, vlee@twitter.com, hpa@zytor.com, namhyung@kernel.org, acme@redhat.com, paulus@samba.org, jolsa@kernel.org, adrian.hunter@intel.com In-Reply-To: <1427137761-16119-1-git-send-email-vlee@twopensource.com> References: <1427137761-16119-1-git-send-email-vlee@twopensource.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Work around lack of sched_getcpu in glibc < 2.6. Git-Commit-ID: e1e455f4f4d35850c30235747620d0d078fe9f64 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: e1e455f4f4d35850c30235747620d0d078fe9f64 Gitweb: http://git.kernel.org/tip/e1e455f4f4d35850c30235747620d0d078fe9f64 Author: Vinson Lee AuthorDate: Mon, 23 Mar 2015 12:09:16 -0700 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 24 Mar 2015 12:08:07 -0300 perf tools: Work around lack of sched_getcpu in glibc < 2.6. This patch fixes this build error with glibc < 2.6. CC util/cloexec.o cc1: warnings being treated as errors util/cloexec.c: In function ‘perf_flag_probe’: util/cloexec.c:24: error: implicit declaration of function ‘sched_getcpu’ util/cloexec.c:24: error: nested extern declaration of ‘sched_getcpu’ make: *** [util/cloexec.o] Error 1 Signed-off-by: Vinson Lee Acked-by: Jiri Olsa Acked-by: Namhyung Kim Cc: Adrian Hunter Cc: Masami Hiramatsu Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Yann Droneaud Cc: stable@vger.kernel.org # 3.18+ Link: http://lkml.kernel.org/r/1427137761-16119-1-git-send-email-vlee@twopensource.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/cloexec.c | 6 ++++++ tools/perf/util/cloexec.h | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/tools/perf/util/cloexec.c b/tools/perf/util/cloexec.c index 6da965b..85b5238 100644 --- a/tools/perf/util/cloexec.c +++ b/tools/perf/util/cloexec.c @@ -7,6 +7,12 @@ static unsigned long flag = PERF_FLAG_FD_CLOEXEC; +int __weak sched_getcpu(void) +{ + errno = ENOSYS; + return -1; +} + static int perf_flag_probe(void) { /* use 'safest' configuration as used in perf_evsel__fallback() */ diff --git a/tools/perf/util/cloexec.h b/tools/perf/util/cloexec.h index 94a5a7d..68888c2 100644 --- a/tools/perf/util/cloexec.h +++ b/tools/perf/util/cloexec.h @@ -3,4 +3,10 @@ unsigned long perf_event_open_cloexec_flag(void); +#ifdef __GLIBC_PREREQ +#if !__GLIBC_PREREQ(2, 6) +extern int sched_getcpu(void) __THROW; +#endif +#endif + #endif /* __PERF_CLOEXEC_H */