From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753387AbbCWTJc (ORCPT ); Mon, 23 Mar 2015 15:09:32 -0400 Received: from mail-pa0-f50.google.com ([209.85.220.50]:35665 "EHLO mail-pa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752120AbbCWTJa (ORCPT ); Mon, 23 Mar 2015 15:09:30 -0400 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 v3] perf tools: Work around lack of sched_getcpu in glibc < 2.6. Date: Mon, 23 Mar 2015 12:09:16 -0700 Message-Id: <1427137761-16119-1-git-send-email-vlee@twopensource.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <20150320203828.GN16485@kernel.org> References: <20150320203828.GN16485@kernel.org> 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 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 | 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 */ -- 1.8.2.1