perf tools: Do not provide dup sched_getcpu() prototype on Android

tip:perf/core tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Jul 16, 2016 perf events

Share & tools

tip-bot for Arnaldo Carvalho de Melo

author merge bot

2016-07-16 20:43 UTC #0 lore raw

Commit-ID:  09dd39d2d2682729174e40161df67f45c151f307
Gitweb:     http://git.kernel.org/tip/09dd39d2d2682729174e40161df67f45c151f307
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Thu, 14 Jul 2016 12:02:04 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Thu, 14 Jul 2016 12:02:04 -0300

perf tools: Do not provide dup sched_getcpu() prototype on Android

The Bionic libc has this definition, so don't duplicate it.

Cc Adrian Hunter <[email protected]>

Cc Chris Phlipot <[email protected]>

Cc David Ahern <[email protected]>

Cc Jiri Olsa <[email protected]>

Cc Namhyung Kim <[email protected]>

Cc Wang Nan <[email protected]>

Link http://lkml.kernel.org/n/[email protected] open here

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

---
 tools/perf/util/util.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

tools/perf/util/util.h +1 -1

index 6178cab..843cbba 100644
@@ -360,7 +360,7 @@ void print_binary(unsigned char *data, size_t len,
 		  size_t bytes_per_line, print_binary_t printer,
 		  void *extra);
 
-#ifndef __GLIBC__
+#if !defined(__GLIBC__) && !defined(__ANDROID__)
 extern int sched_getcpu(void);
 #endif