Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753976AbbBNCHB (ORCPT ); Fri, 13 Feb 2015 21:07:01 -0500 Received: from mail-pd0-f174.google.com ([209.85.192.174]:36677 "EHLO mail-pd0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753132AbbBNCG7 (ORCPT ); Fri, 13 Feb 2015 21:06:59 -0500 From: Vinson Lee To: Peter Zijlstra , Paul Mackerras , Ingo Molnar , Arnaldo Carvalho de Melo , Jiri Olsa , Adrian Hunter , Masami Hiramatsu , Namhyung Kim , Yann Droneaud Cc: linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Vinson Lee Subject: [PATCH] perf tools: Work around lack of sched_getcpu in glibc < 2.6. Date: Fri, 13 Feb 2015 18:06:47 -0800 Message-Id: <1423879609-4373-1-git-send-email-vlee@twopensource.com> X-Mailer: git-send-email 2.1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1494 Lines: 57 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 + 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 -- 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/