From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout.kundenserver.de ([217.72.192.75]:63093 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760757AbcLPK5G (ORCPT ); Fri, 16 Dec 2016 05:57:06 -0500 From: Arnd Bergmann Subject: [PATCH 10/13] asm-generic: mark cmpxchg as __always_inline for gcc-4.3 Date: Fri, 16 Dec 2016 11:56:31 +0100 Message-ID: <20161216105634.235457-11-arnd@arndb.de> In-Reply-To: <20161216105634.235457-1-arnd@arndb.de> References: <20161216105634.235457-1-arnd@arndb.de> Sender: linux-arch-owner@vger.kernel.org List-ID: To: linux-arch@vger.kernel.org Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@vger.kernel.org, Russell King , Andrew Morton , kernel-build-reports@lists.linaro.org, kvmarm@lists.cs.columbia.edu, Arnd Bergmann Message-ID: <20161216105631.4_wGNn-R_gFcJsU1WNnc54pt_H7ATDzP9h9JRYRxcQo@z> With CONFIG_OPTIMIZE_INLINING and older compilers, we can get a link error such as kernel/task_work.o: In function `__cmpxchg_local_generic': task_work.c:(.text+0x14c): undefined reference to `wrong_size_cmpxchg' kernel/locking/rtmutex.o: In function `__cmpxchg_local_generic': rtmutex.c:(.text+0x5ec): undefined reference to `wrong_size_cmpxchg' kernel/trace/ring_buffer.o: In function `__cmpxchg_local_generic': Marking the functions in question as __always_inline avoids that possibility. Signed-off-by: Arnd Bergmann --- include/asm-generic/cmpxchg-local.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/asm-generic/cmpxchg-local.h b/include/asm-generic/cmpxchg-local.h index 70bef78912b7..e82d7032b1b8 100644 --- a/include/asm-generic/cmpxchg-local.h +++ b/include/asm-generic/cmpxchg-local.h @@ -11,7 +11,8 @@ extern unsigned long wrong_size_cmpxchg(volatile void *ptr) * Generic version of __cmpxchg_local (disables interrupts). Takes an unsigned * long parameter, supporting various types of architectures. */ -static inline unsigned long __cmpxchg_local_generic(volatile void *ptr, +static __always_inline unsigned long +__cmpxchg_local_generic(volatile void *ptr, unsigned long old, unsigned long new, int size) { unsigned long flags, prev; @@ -50,8 +51,8 @@ static inline unsigned long __cmpxchg_local_generic(volatile void *ptr, /* * Generic version of __cmpxchg64_local. Takes an u64 parameter. */ -static inline u64 __cmpxchg64_local_generic(volatile void *ptr, - u64 old, u64 new) +static __always_inline u64 +__cmpxchg64_local_generic(volatile void *ptr, u64 old, u64 new) { u64 prev; unsigned long flags; -- 2.9.0