lkml.org 
[lkml]   [2022]   [Dec]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 08/19] arch/m68k: rename internal name __xchg to __arch_xchg
    Date
    __xchg will be used for non-atomic xchg macro.

    Signed-off-by: Andrzej Hajda <andrzej.hajda@intel.com>
    ---
    arch/m68k/include/asm/cmpxchg.h | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/arch/m68k/include/asm/cmpxchg.h b/arch/m68k/include/asm/cmpxchg.h
    index 6cf464cdab067e..d7f3de9c5d6f79 100644
    --- a/arch/m68k/include/asm/cmpxchg.h
    +++ b/arch/m68k/include/asm/cmpxchg.h
    @@ -9,7 +9,7 @@
    extern unsigned long __invalid_xchg_size(unsigned long, volatile void *, int);

    #ifndef CONFIG_RMW_INSNS
    -static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
    +static inline unsigned long __arch_xchg(unsigned long x, volatile void * ptr, int size)
    {
    unsigned long flags, tmp;

    @@ -40,7 +40,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz
    return x;
    }
    #else
    -static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
    +static inline unsigned long __arch_xchg(unsigned long x, volatile void * ptr, int size)
    {
    switch (size) {
    case 1:
    @@ -75,7 +75,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz
    }
    #endif

    -#define arch_xchg(ptr,x) ({(__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)));})
    +#define arch_xchg(ptr,x) ({(__typeof__(*(ptr)))__arch_xchg((unsigned long)(x),(ptr),sizeof(*(ptr)));})

    #include <asm-generic/cmpxchg-local.h>

    --
    2.34.1
    \
     
     \ /
      Last update: 2023-03-26 23:17    [W:4.247 / U:26.264 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site