[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20150319101304.GC6363@krava>
Date: Thu, 19 Mar 2015 11:13:04 +0100
From: Jiri Olsa <jolsa@...hat.com>
To: Vinson Lee <vlee@...pensource.com>
Cc: Peter Zijlstra <a.p.zijlstra@...llo.nl>,
Paul Mackerras <paulus@...ba.org>,
Ingo Molnar <mingo@...hat.com>,
Arnaldo Carvalho de Melo <acme@...nel.org>,
Adrian Hunter <adrian.hunter@...el.com>,
Masami Hiramatsu <masami.hiramatsu.pt@...achi.com>,
Namhyung Kim <namhyung@...nel.org>,
Yann Droneaud <ydroneaud@...eya.com>,
linux-kernel@...r.kernel.org, linux-perf-users@...r.kernel.org,
Vinson Lee <vlee@...tter.com>
Subject: Re: [PATCH v2] perf tools: Work around lack of sched_getcpu in glibc
< 2.6.
On Wed, Mar 18, 2015 at 04:11:52PM -0700, Vinson Lee wrote:
> From: Vinson Lee <vlee@...tter.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@...r.kernel.org # 3.18+
> Signed-off-by: Vinson Lee <vlee@...tter.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 6da965b..285bd70 100644
> --- a/tools/perf/util/cloexec.c
> +++ b/tools/perf/util/cloexec.c
> @@ -7,6 +7,16 @@
>
> static unsigned long flag = PERF_FLAG_FD_CLOEXEC;
>
> +#ifdef __GLIBC_PREREQ
> +#if !__GLIBC_PREREQ(2, 6)
> +static int sched_getcpu(void)
> +{
> + errno = ENOSYS;
> + return -1;
> +}
> +#endif
> +#endif
you could mark it as __weak and get rid of those ifdef's
like we do for strlcpy in utilpath.c
jirka
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists