From: Greg Ungerer Date: Mon, 15 Jun 2020 04:20:47 +0000 (+1000) Subject: m68k: use asm-generic cmpxchg_local() X-Git-Tag: v5.9-rc1~101^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f944814eea028be6cc489d3080ed2901525ded1d;p=thirdparty%2Fkernel%2Flinux.git m68k: use asm-generic cmpxchg_local() Use the asm-generic version of the cmpxchg_local() macro. Although not all target types use asm-generic/cmpxchg.h, for those that do the local cmpxchg_local() is the same as the asm-generic/cmpxchg.h one. So no need to define the local one. Signed-off-by: Greg Ungerer --- diff --git a/arch/m68k/include/asm/cmpxchg.h b/arch/m68k/include/asm/cmpxchg.h index 38e1d7acc44dc..3a3bdcfcd3754 100644 --- a/arch/m68k/include/asm/cmpxchg.h +++ b/arch/m68k/include/asm/cmpxchg.h @@ -129,14 +129,6 @@ static inline unsigned long __cmpxchg(volatile void *p, unsigned long old, #else -/* - * cmpxchg_local and cmpxchg64_local are atomic wrt current CPU. Always make - * them available. - */ -#define cmpxchg_local(ptr, o, n) \ - ((__typeof__(*(ptr)))__cmpxchg_local_generic((ptr), (unsigned long)(o),\ - (unsigned long)(n), sizeof(*(ptr)))) - #include #endif