Re: [PATCH 13/19] arch/riscv: rename internal name __xchg to __arch_xchg

Palmer Dabbelt
2022-12-29T16:22:26Z

On Thu, 22 Dec 2022 03:46:29 PST (-0800), andrzej.hajda@intel.com wrote:
> __xchg will be used for non-atomic xchg macro.
>
> Signed-off-by: Andrzej Hajda <andrzej.hajda@intel.com>
> ---
> arch/riscv/include/asm/atomic.h | 2 +-
> arch/riscv/include/asm/cmpxchg.h | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/riscv/include/asm/atomic.h b/arch/riscv/include/asm/atomic.h
> index 0dfe9d857a762b..bba472928b5393 100644
> --- a/arch/riscv/include/asm/atomic.h
> +++ b/arch/riscv/include/asm/atomic.h
> @@ -261,7 +261,7 @@ c_t arch_atomic##prefix##_xchg_release(atomic##prefix##_t *v, c_t n) \
> static __always_inline \
> c_t arch_atomic##prefix##_xchg(atomic##prefix##_t *v, c_t n) \
> { \
> - return __xchg(&(v->counter), n, size); \
> + return __arch_xchg(&(v->counter), n, size); \
> } \
> static __always_inline \
> c_t arch_atomic##prefix##_cmpxchg_relaxed(atomic##prefix##_t *v, \
> diff --git a/arch/riscv/include/asm/cmpxchg.h b/arch/riscv/include/asm/cmpxchg.h
> index 12debce235e52d..2f4726d3cfcc25 100644
> --- a/arch/riscv/include/asm/cmpxchg.h
> +++ b/arch/riscv/include/asm/cmpxchg.h
> @@ -114,7 +114,7 @@
> _x_, sizeof(*(ptr))); \
> })
>
> -#define __xchg(ptr, new, size) \
> +#define __arch_xchg(ptr, new, size) \
> ({ \
> __typeof__(ptr) __ptr = (ptr); \
> __typeof__(new) __new = (new); \
> @@ -143,7 +143,7 @@
> #define arch_xchg(ptr, x) \
> ({ \
> __typeof__(*(ptr)) _x_ = (x); \
> - (__typeof__(*(ptr))) __xchg((ptr), _x_, sizeof(*(ptr))); \
> + (__typeof__(*(ptr))) __arch_xchg((ptr), _x_, sizeof(*(ptr))); \
> })
>
> #define xchg32(ptr, x) \

Acked-by: Palmer Dabbelt <palmer@rivosinc.com>

Thanks!