Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751699AbbBPUus (ORCPT ); Mon, 16 Feb 2015 15:50:48 -0500 Received: from ou.quest-ce.net ([195.154.187.82]:49461 "EHLO ou.quest-ce.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751038AbbBPUuq (ORCPT ); Mon, 16 Feb 2015 15:50:46 -0500 Message-ID: <1424119815.32606.14.camel@opteya.com> From: Yann Droneaud To: Vinson Lee Cc: Peter Zijlstra , Paul Mackerras , Ingo Molnar , Arnaldo Carvalho de Melo , Jiri Olsa , Adrian Hunter , Masami Hiramatsu , Namhyung Kim , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Vinson Lee Date: Mon, 16 Feb 2015 21:50:15 +0100 In-Reply-To: <1423879609-4373-1-git-send-email-vlee@twopensource.com> References: <1423879609-4373-1-git-send-email-vlee@twopensource.com> Organization: OPTEYA Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.12.10 (3.12.10-1.fc21) Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 2a01:e35:2e9f:6ac0:6cf8:dad1:e326:9c6c X-SA-Exim-Mail-From: ydroneaud@opteya.com Subject: Re: [PATCH] perf tools: Work around lack of sched_getcpu in glibc < 2.6. X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: Yes (on ou.quest-ce.net) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1866 Lines: 74 Hi, Le vendredi 13 février 2015 à 18:06 -0800, Vinson Lee a écrit : > From: Vinson Lee > > 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 > --- > 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 > + OK > 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 */ I've reviewed the use of __GLIBC_PREREQ(2, 6), but not whether using cpu = 0 is OK if sched_getcpu() is not available. Reviewed-by: Yann Droneaud Regards. -- Yann Droneaud OPTEYA -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/