summaryrefslogtreecommitdiffstats
path: root/arch/mips/include
diff options
context:
space:
mode:
authorUros Bizjak <ubizjak@gmail.com>2023-07-08 11:00:36 +0200
committerPeter Zijlstra <peterz@infradead.org>2023-07-10 09:52:36 +0200
commitd6b45484c130f4095313ae3edeb4aae662c12fb1 (patch)
tree202f615521f7b039845ce107ab1231732e215452 /arch/mips/include
parent28fd85a10a2a73658c6e26056d9e093de06b5a22 (diff)
downloadlinux-d6b45484c130f4095313ae3edeb4aae662c12fb1.tar.gz
linux-d6b45484c130f4095313ae3edeb4aae662c12fb1.tar.bz2
linux-d6b45484c130f4095313ae3edeb4aae662c12fb1.zip
locking/arch: Avoid variable shadowing in local_try_cmpxchg()
Several architectures define arch_try_local_cmpxchg macro using internal temporary variables named ___old, __old or _old. Remove temporary varible in local_try_cmpxchg to avoid variable shadowing. No functional change intended. Fixes: d994f2c8e241 ("locking/arch: Wire up local_try_cmpxchg()") Closes: https://lore.kernel.org/lkml/CAFGhKbyxtuk=LoW-E3yLXgcmR93m+Dfo5-u9oQA_YC5Fcy_t9g@mail.gmail.com/ Reported-by: Charlemagne Lasse <charlemagnelasse@gmail.com> Signed-off-by: Uros Bizjak <ubizjak@gmail.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Link: https://lkml.kernel.org/r/20230708090048.63046-1-ubizjak@gmail.com
Diffstat (limited to 'arch/mips/include')
-rw-r--r--arch/mips/include/asm/local.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/include/asm/local.h b/arch/mips/include/asm/local.h
index 5daf6fe8e3e9..e6ae3df0349d 100644
--- a/arch/mips/include/asm/local.h
+++ b/arch/mips/include/asm/local.h
@@ -101,8 +101,8 @@ static __inline__ long local_cmpxchg(local_t *l, long old, long new)
static __inline__ bool local_try_cmpxchg(local_t *l, long *old, long new)
{
- typeof(l->a.counter) *__old = (typeof(l->a.counter) *) old;
- return try_cmpxchg_local(&l->a.counter, __old, new);
+ return try_cmpxchg_local(&l->a.counter,
+ (typeof(l->a.counter) *) old, new);
}
#define local_xchg(l, n) (atomic_long_xchg((&(l)->a), (n)))