Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1444923 > unrolled thread

[tip:perf/core] perf tools: Do not provide dup sched_getcpu() prototype on Android

Back to article view | Back to linux.kernel

Contents

  [tip:perf/core] perf tools: Do not provide dup sched_getcpu()  prototype on Android tip-bot for Arnaldo Carvalho de Melo <tipbot@zytor.com> - 2016-07-16 22:50 +0200

#1444923 — [tip:perf/core] perf tools: Do not provide dup sched_getcpu() prototype on Android

Commit-ID:  09dd39d2d2682729174e40161df67f45c151f307
Gitweb:     http://git.kernel.org/tip/09dd39d2d2682729174e40161df67f45c151f307
Author:     Arnaldo Carvalho de Melo <acme@redhat.com>
AuthorDate: Thu, 14 Jul 2016 12:02:04 -0300
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
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 <adrian.hunter@intel.com>
Cc: Chris Phlipot <cphlipot0@gmail.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-rmd19832zkt07e4crdzyen9z@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/util.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h
index 6178cab..843cbba 100644
--- a/tools/perf/util/util.h
+++ b/tools/perf/util/util.h
@@ -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
 

[toc] | [standalone]

Back to top | Article view | linux.kernel

csiph-web