From: tip-bot for Vinson Lee <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
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
Subject: [tip:perf/core] perf tools: Work around lack of sched_getcpu in glibc < 2.6.
Date: Tue, 24 Mar 2015 09:32:14 -0700 [thread overview]
Message-ID: <tip-e1e455f4f4d35850c30235747620d0d078fe9f64@git.kernel.org> (raw)
In-Reply-To: <1427137761-16119-1-git-send-email-vlee@twopensource.com>
Commit-ID: e1e455f4f4d35850c30235747620d0d078fe9f64
Gitweb: http://git.kernel.org/tip/e1e455f4f4d35850c30235747620d0d078fe9f64
Author: Vinson Lee <vlee@twitter.com>
AuthorDate: Mon, 23 Mar 2015 12:09:16 -0700
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
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 <vlee@twitter.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Yann Droneaud <ydroneaud@opteya.com>
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 <acme@redhat.com>
---
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 */
prev parent reply other threads:[~2015-03-24 16:32 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-14 2:06 [PATCH] perf tools: Work around lack of sched_getcpu in glibc < 2.6 Vinson Lee
2015-02-16 20:50 ` Yann Droneaud
2015-03-17 23:49 ` Vinson Lee
2015-03-18 9:15 ` Peter Zijlstra
2015-03-18 23:11 ` [PATCH v2] " Vinson Lee
2015-03-19 10:13 ` Jiri Olsa
2015-03-19 13:14 ` Arnaldo Carvalho de Melo
2015-03-19 21:12 ` Vinson Lee
2015-03-20 13:03 ` Arnaldo Carvalho de Melo
2015-03-20 18:44 ` Vinson Lee
2015-03-20 20:38 ` Arnaldo Carvalho de Melo
2015-03-23 19:09 ` [PATCH v3] " Vinson Lee
2015-03-24 0:21 ` Namhyung Kim
2015-03-24 7:10 ` Jiri Olsa
2015-03-24 16:32 ` tip-bot for Vinson Lee [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-e1e455f4f4d35850c30235747620d0d078fe9f64@git.kernel.org \
--to=tipbot@zytor.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=adrian.hunter@intel.com \
--cc=hpa@zytor.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=paulus@samba.org \
--cc=tglx@linutronix.de \
--cc=vlee@twitter.com \
--cc=ydroneaud@opteya.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).