From: Vinson Lee <vlee@twopensource.com>
To: Peter Zijlstra <a.p.zijlstra@chello.nl>,
Paul Mackerras <paulus@samba.org>, Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Jiri Olsa <jolsa@redhat.com>,
Adrian Hunter <adrian.hunter@intel.com>,
Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>,
Namhyung Kim <namhyung@kernel.org>,
Yann Droneaud <ydroneaud@opteya.com>
Cc: linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
Vinson Lee <vlee@twitter.com>
Subject: [PATCH] perf tools: Work around lack of sched_getcpu in glibc < 2.6.
Date: Fri, 13 Feb 2015 18:06:47 -0800 [thread overview]
Message-ID: <1423879609-4373-1-git-send-email-vlee@twopensource.com> (raw)
From: Vinson Lee <vlee@twitter.com>
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
Cc: stable@vger.kernel.org # 3.18+
Signed-off-by: Vinson Lee <vlee@twitter.com>
---
tools/perf/util/cloexec.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/tools/perf/util/cloexec.c b/tools/perf/util/cloexec.c
index 47b78b3..3738924 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;
+#ifdef __GLIBC_PREREQ
+#if __GLIBC_PREREQ(2, 6)
+#define HAVE_SCHED_GETCPU
+#endif
+#endif
+
static int perf_flag_probe(void)
{
/* use 'safest' configuration as used in perf_evsel__fallback() */
@@ -21,9 +27,13 @@ static int perf_flag_probe(void)
pid_t pid = -1;
char sbuf[STRERR_BUFSIZE];
+#ifdef HAVE_SCHED_GETCPU
cpu = sched_getcpu();
if (cpu < 0)
cpu = 0;
+#else
+ cpu = 0;
+#endif
while (1) {
/* check cloexec flag */
--
1.8.2.1
next reply other threads:[~2015-02-14 2:06 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-14 2:06 Vinson Lee [this message]
2015-02-16 20:50 ` [PATCH] perf tools: Work around lack of sched_getcpu in glibc < 2.6 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:perf/core] " tip-bot for Vinson Lee
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=1423879609-4373-1-git-send-email-vlee@twopensource.com \
--to=vlee@twopensource.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=paulus@samba.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.