Skip to contentSkip to conversation

locking/arch: Avoid variable shadowing in local_try_cmpxchg()

PATCH New Uros Bizjak 1 participant 1 message May 17, 2023

Subsystems (4)
x86 MIPS Generic include/asm header files LoongArch
lore
Share & tools
lore

Uros Bizjak

author
#0 lore raw

PATCH 1/1 locking/arch: Avoid variable shadowing in local_try_cmpxchg()

Several architectures define arch_try_local_cmpxchg macro using internal temporary variables named __old or _old. Uglify equally named variable in local_try_cmpxchg() with additional underscore to avoid variable shadowing warning.

Fixes d994f2c8e241 ("locking/arch: Wire up local_try_cmpxchg()")
Reported-by Charlemagne Lasse <[email protected]>
Closes https://lore.kernel.org/lkml/CAFGhKbyxtuk=LoW-E3yLXgcmR93m+Dfo5-u9oQA_YC5Fcy_t9g@mail.gmail.com/ open here
Cc Huacai Chen <[email protected]>
Cc WANG Xuerui <[email protected]>
Cc Jiaxun Yang <[email protected]>
Cc Jun Yi <[email protected]>
Cc Thomas Bogendoerfer <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Dave Hansen <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
Signed-off-by Uros Bizjak <[email protected]>
---
 arch/loongarch/include/asm/local.h | 4 ++--
 arch/mips/include/asm/local.h      | 4 ++--
 arch/x86/include/asm/local.h       | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
arch/loongarch/include/asm/local.h +2 -2
index 83e995b30e47..4c6e4ed23433 100644
@@ -63,8 +63,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);
+	typeof(l->a.counter) *___old = (typeof(l->a.counter) *) old;
+	return try_cmpxchg_local(&l->a.counter, ___old, new);
 }
 
 #define local_xchg(l, n) (atomic_long_xchg((&(l)->a), (n)))
arch/mips/include/asm/local.h +2 -2
index 5daf6fe8e3e9..de276e2ebb64 100644
@@ -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);
+	typeof(l->a.counter) *___old = (typeof(l->a.counter) *) old;
+	return try_cmpxchg_local(&l->a.counter, ___old, new);
 }
 
 #define local_xchg(l, n) (atomic_long_xchg((&(l)->a), (n)))
arch/x86/include/asm/local.h +2 -2
index 56d4ef604b91..36cf5ca83ccb 100644
@@ -127,8 +127,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);
+	typeof(l->a.counter) *___old = (typeof(l->a.counter) *) old;
+	return try_cmpxchg_local(&l->a.counter, ___old, new);
 }
 
 /* Always has a lock prefix */
Signature · 1 line
2.40.1