Commit 6988631b authored by Mark Rutland's avatar Mark Rutland Committed by Peter Zijlstra
Browse files

locking/atomic: cmpxchg: make `generic` a prefix 



The asm-generic implementations of cmpxchg_local() and cmpxchg64_local()
use a `_generic` suffix to distinguish themselves from arch code or
wrappers used elsewhere.

Subsequent patches will add ARCH_ATOMIC support to these
implementations, and will distinguish more functions with a `generic`
portion. To align with how ARCH_ATOMIC uses an `arch_` prefix, it would
be helpful to use a `generic_` prefix rather than a `_generic` suffix.

In preparation for this, this patch renames the existing functions to
make `generic` a prefix rather than a suffix. There should be no
functional change as a result of this patch.

Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Boqun Feng <boqun.feng@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20210525140232.53872-12-mark.rutland@arm.com
parent 1bdadf46

arch/arm/include/asm/cmpxchg.h

+3 −3
Original line number Diff line number Diff line
@@ -135,13 +135,13 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size 
 * them available.

 */

#define cmpxchg_local(ptr, o, n) ({					\

	(__typeof(*ptr))__cmpxchg_local_generic((ptr),			\

	(__typeof(*ptr))__generic_cmpxchg_local((ptr),			\

					        (unsigned long)(o),	\

					        (unsigned long)(n),	\

					        sizeof(*(ptr)));	\

})



#define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))

#define cmpxchg64_local(ptr, o, n) __generic_cmpxchg64_local((ptr), (o), (n))



#include <asm-generic/cmpxchg.h>
@@ -224,7 +224,7 @@ static inline unsigned long __cmpxchg_local(volatile void *ptr, 
#ifdef CONFIG_CPU_V6	/* min ARCH == ARMv6 */

	case 1:

	case 2:

		ret = __cmpxchg_local_generic(ptr, old, new, size);

		ret = __generic_cmpxchg_local(ptr, old, new, size);

		break;

#endif

	default:

arch/m68k/include/asm/cmpxchg.h

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz 


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



#define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))

#define cmpxchg64_local(ptr, o, n) __generic_cmpxchg64_local((ptr), (o), (n))



extern unsigned long __invalid_cmpxchg_size(volatile void *,

					    unsigned long, unsigned long, int);

arch/mips/include/asm/cmpxchg.h

+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ unsigned long __cmpxchg(volatile void *ptr, unsigned long old, 
#else



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

# define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))

# define cmpxchg64_local(ptr, o, n) __generic_cmpxchg64_local((ptr), (o), (n))



# ifdef CONFIG_SMP

arch/parisc/include/asm/cmpxchg.h

+2 −2
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static inline unsigned long __cmpxchg_local(volatile void *ptr, 
#endif

	case 4:	return __cmpxchg_u32(ptr, old, new_);

	default:

		return __cmpxchg_local_generic(ptr, old, new_, size);

		return __generic_cmpxchg_local(ptr, old, new_, size);

	}

}
@@ -116,7 +116,7 @@ static inline unsigned long __cmpxchg_local(volatile void *ptr, 
	cmpxchg_local((ptr), (o), (n));					\

})

#else

#define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))

#define cmpxchg64_local(ptr, o, n) __generic_cmpxchg64_local((ptr), (o), (n))

#endif



#define cmpxchg64(ptr, o, n) __cmpxchg_u64(ptr, o, n)

arch/powerpc/include/asm/cmpxchg.h

+1 −1
Original line number Diff line number Diff line
@@ -524,7 +524,7 @@ __cmpxchg_acquire(void *ptr, unsigned long old, unsigned long new, 
})

#else

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

#define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))

#define cmpxchg64_local(ptr, o, n) __generic_cmpxchg64_local((ptr), (o), (n))

#endif



#endif /* __KERNEL__ */