[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <mhng-8937d883-402e-4523-a023-8171ed0e386b@palmer-ri-x1c9>
Date: Thu, 29 Dec 2022 08:22:26 -0800 (PST)
From: Palmer Dabbelt <palmer@...belt.com>
To: andrzej.hajda@...el.com
CC: linux-alpha@...r.kernel.org, linux-kernel@...r.kernel.org,
linux-snps-arc@...ts.infradead.org,
linux-arm-kernel@...ts.infradead.org,
linux-hexagon@...r.kernel.org, linux-ia64@...r.kernel.org,
loongarch@...ts.linux.dev, linux-m68k@...ts.linux-m68k.org,
linux-mips@...r.kernel.org, openrisc@...ts.librecores.org,
linux-parisc@...r.kernel.org, linuxppc-dev@...ts.ozlabs.org,
linux-riscv@...ts.infradead.org, linux-s390@...r.kernel.org,
linux-sh@...r.kernel.org, sparclinux@...r.kernel.org,
linux-xtensa@...ux-xtensa.org, intel-gfx@...ts.freedesktop.org,
dri-devel@...ts.freedesktop.org, andrzej.hajda@...el.com,
Arnd Bergmann <arnd@...db.de>, rodrigo.vivi@...el.com,
akpm@...ux-foundation.org, andriy.shevchenko@...ux.intel.com,
peterz@...radead.org, boqun.feng@...il.com, mark.rutland@....com
Subject: Re: [PATCH 13/19] arch/riscv: rename internal name __xchg to __arch_xchg
On Thu, 22 Dec 2022 03:46:29 PST (-0800), andrzej.hajda@...el.com wrote:
> __xchg will be used for non-atomic xchg macro.
>
> Signed-off-by: Andrzej Hajda <andrzej.hajda@...el.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@...osinc.com>
Thanks!
Powered by blists - more mailing lists