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

Groups > linux.kernel > #1444587

[PATCH 02/24] perf tools: Do not provide dup sched_getcpu() prototype on Android

Show all headers | View raw

From: Arnaldo Carvalho de Melo <acme@redhat.com>

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 6178cab82374..843cbba8f9d3 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
 
-- 
2.7.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[GIT PULL 00/24] perf/core improvements and fixes Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-07-15 23:00 +0200
  [PATCH 06/24] tools lib api fs: Use base 0 in filename__read_ull Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-07-15 23:00 +0200
  [PATCH 17/24] perf evlist: Setup backward mmap state machine Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-07-15 23:00 +0200
  [PATCH 20/24] perf tools: Enable overwrite settings Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-07-15 23:00 +0200
  [PATCH 16/24] perf evlist: Drop evlist->backward Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-07-15 23:00 +0200
  [PATCH 10/24] perf evlist: Update mmap related APIs and helpers Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-07-15 23:00 +0200
  [PATCH 13/24] perf evlist: Extract common code in mmap failure processing Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-07-15 23:00 +0200
  [PATCH 09/24] tools lib fd array: Allow associating a pointer cookie with each entry Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-07-15 23:00 +0200
  [PATCH 02/24] perf tools: Do not provide dup sched_getcpu() prototype on Android Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-07-15 23:00 +0200
  [PATCH 08/24] tools: Simplify BITS_PER_LONG define Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-07-15 23:00 +0200
  Re: [GIT PULL 00/24] perf/core improvements and fixes Ingo Molnar <mingo@kernel.org> - 2016-07-16 22:40 +0200

csiph-web