From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751981AbcGPUoN (ORCPT ); Sat, 16 Jul 2016 16:44:13 -0400 Received: from terminus.zytor.com ([198.137.202.10]:38434 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751698AbcGPUoK (ORCPT ); Sat, 16 Jul 2016 16:44:10 -0400 Date: Sat, 16 Jul 2016 13:43:58 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: adrian.hunter@intel.com, hpa@zytor.com, wangnan0@huawei.com, linux-kernel@vger.kernel.org, namhyung@kernel.org, mingo@kernel.org, cphlipot0@gmail.com, jolsa@kernel.org, acme@redhat.com, dsahern@gmail.com, tglx@linutronix.de Reply-To: dsahern@gmail.com, acme@redhat.com, tglx@linutronix.de, cphlipot0@gmail.com, jolsa@kernel.org, linux-kernel@vger.kernel.org, namhyung@kernel.org, wangnan0@huawei.com, mingo@kernel.org, hpa@zytor.com, adrian.hunter@intel.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tools: Make "__always_inline" just "inline" on Android Git-Commit-ID: 8c98abff43616a2a9c208189f86d32cefafbe708 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: 8c98abff43616a2a9c208189f86d32cefafbe708 Gitweb: http://git.kernel.org/tip/8c98abff43616a2a9c208189f86d32cefafbe708 Author: Arnaldo Carvalho de Melo AuthorDate: Thu, 14 Jul 2016 12:03:04 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 14 Jul 2016 12:03:04 -0300 tools: Make "__always_inline" just "inline" on Android As the gcc there is producing tons of: "warning: always_inline function might not be inlinable" At least on android-ndk-r12/platforms/android-24/arch-arm, so, for the time being, use this big hammer. 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-97l3eg3fnk5shmo4rsyyvj2t@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/include/linux/compiler.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tools/include/linux/compiler.h b/tools/include/linux/compiler.h index fa7208a..e33fc1d 100644 --- a/tools/include/linux/compiler.h +++ b/tools/include/linux/compiler.h @@ -9,6 +9,17 @@ # define __always_inline inline __attribute__((always_inline)) #endif +#ifdef __ANDROID__ +/* + * FIXME: Big hammer to get rid of tons of: + * "warning: always_inline function might not be inlinable" + * + * At least on android-ndk-r12/platforms/android-24/arch-arm + */ +#undef __always_inline +#define __always_inline inline +#endif + #define __user #ifndef __attribute_const__