lkml.org 
[lkml]   [2016]   [Dec]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 09/13] ARM: mark cmpxchg and xchg __always_inline for gcc-4.3
    Date
    With older compiler versions like gcc-4.3 and CONFIG_OPTIMIZE_INLINING,
    I run into link errors:

    kernel/task_work.o: In function `__cmpxchg':
    task_work.c:(.text+0x8c): undefined reference to `__bad_cmpxchg'
    kernel/kthread.o: In function `__xchg':
    kthread.c:(.text+0x7bc): undefined reference to `__bad_xchg'

    This marks the functions in question as __always_inline to force
    inlining.

    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    ---
    arch/arm/include/asm/cmpxchg.h | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    diff --git a/arch/arm/include/asm/cmpxchg.h b/arch/arm/include/asm/cmpxchg.h
    index 12215515ba02..218ba0ae90cd 100644
    --- a/arch/arm/include/asm/cmpxchg.h
    +++ b/arch/arm/include/asm/cmpxchg.h
    @@ -24,7 +24,8 @@
    #define swp_is_buggy
    #endif

    -static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size)
    +static __always_inline unsigned long
    +__xchg(unsigned long x, volatile void *ptr, int size)
    {
    extern void __bad_xchg(volatile void *, int);
    unsigned long ret;
    @@ -152,8 +153,8 @@ extern void __bad_cmpxchg(volatile void *ptr, int size);
    * cmpxchg only support 32-bits operands on ARMv6.
    */

    -static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old,
    - unsigned long new, int size)
    +static __always_inline unsigned long
    +__cmpxchg(volatile void *ptr, unsigned long old, unsigned long new, int size)
    {
    unsigned long oldval, res;

    @@ -213,9 +214,8 @@ static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old,
    sizeof(*(ptr))); \
    })

    -static inline unsigned long __cmpxchg_local(volatile void *ptr,
    - unsigned long old,
    - unsigned long new, int size)
    +static __always_inline unsigned long
    +__cmpxchg_local(volatile void *ptr, unsigned long old, unsigned long new, int size)
    {
    unsigned long ret;

    --
    2.9.0
    \
     
     \ /
      Last update: 2016-12-16 11:59    [W:4.677 / U:0.184 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site