linux-kernel - [tip:perf/core] perf tools: Do not provide dup sched

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <tip-rmd19832zkt07e4crdzyen9z@git.kernel.org>
Date:	Sat, 16 Jul 2016 13:43:33 -0700
From:	tip-bot for Arnaldo Carvalho de Melo <tipbot@...or.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	tglx@...utronix.de, acme@...hat.com, hpa@...or.com,
	namhyung@...nel.org, mingo@...nel.org, dsahern@...il.com,
	jolsa@...nel.org, wangnan0@...wei.com, adrian.hunter@...el.com,
	cphlipot0@...il.com, linux-kernel@...r.kernel.org
Subject: [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@...hat.com>
AuthorDate: Thu, 14 Jul 2016 12:02:04 -0300
Committer:  Arnaldo Carvalho de Melo <acme@...hat.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@...el.com>
Cc: Chris Phlipot <cphlipot0@...il.com>
Cc: David Ahern <dsahern@...il.com>
Cc: Jiri Olsa <jolsa@...nel.org>
Cc: Namhyung Kim <namhyung@...nel.org>
Cc: Wang Nan <wangnan0@...wei.com>
Link: http://lkml.kernel.org/n/tip-rmd19832zkt07e4crdzyen9z@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.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