From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751942AbcGPUno (ORCPT ); Sat, 16 Jul 2016 16:43:44 -0400 Received: from terminus.zytor.com ([198.137.202.10]:38410 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751698AbcGPUnm (ORCPT ); Sat, 16 Jul 2016 16:43:42 -0400 Date: Sat, 16 Jul 2016 13:43:33 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: tglx@linutronix.de, acme@redhat.com, hpa@zytor.com, namhyung@kernel.org, mingo@kernel.org, dsahern@gmail.com, jolsa@kernel.org, wangnan0@huawei.com, adrian.hunter@intel.com, cphlipot0@gmail.com, linux-kernel@vger.kernel.org Reply-To: namhyung@kernel.org, mingo@kernel.org, hpa@zytor.com, acme@redhat.com, tglx@linutronix.de, cphlipot0@gmail.com, linux-kernel@vger.kernel.org, wangnan0@huawei.com, adrian.hunter@intel.com, jolsa@kernel.org, dsahern@gmail.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Do not provide dup sched_getcpu() prototype on Android Git-Commit-ID: 09dd39d2d2682729174e40161df67f45c151f307 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 09dd39d2d2682729174e40161df67f45c151f307 Gitweb: http://git.kernel.org/tip/09dd39d2d2682729174e40161df67f45c151f307 Author: Arnaldo Carvalho de Melo AuthorDate: Thu, 14 Jul 2016 12:02:04 -0300 Committer: Arnaldo Carvalho de Melo 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 Cc: Chris Phlipot Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-rmd19832zkt07e4crdzyen9z@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- 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