Skip to contentSkip to conversation

MIPS: locking/atomic: Fix atomic{_64,}_sub_if_positive

PATCH In review Guenter Roeck 2 participants 2 messages Jun 10, 2023 – Jun 12, 2023 Stable branch

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 MIPS: locking/atomic: Fix atomic{_64,}_sub_if_positive

From: Rui Wang <[email protected]>

commit cb95ea79b3fc772c5873a7a4532ab4c14a455da2 upstream.

This looks like a typo and that caused atomic64 test failed.

---
I recently enabled atomic CONFIG_ATOMIC64_SELFTEST, which results in a crash when testing 64-bit little endian mips images in v5.10.y. This patch fixes the problem.

 arch/mips/include/asm/atomic.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/include/asm/atomic.h +1 -1
index 27ad76791539..fd0e09033a7c 100644
@@ -203,7 +203,7 @@ ATOMIC_OPS(atomic64, xor, s64, ^=, xor, lld, scd)
  * The function returns the old value of @v minus @i.
  */
 #define ATOMIC_SIP_OP(pfx, type, op, ll, sc)				\
-static __inline__ int pfx##_sub_if_positive(type i, pfx##_t * v)	\
+static __inline__ type pfx##_sub_if_positive(type i, pfx##_t * v)	\
 {									\
 	type temp, result;						\
 									\
Signature · 1 line
2.39.2
#1 lore raw
Quoted 9 lines · Guenter Roeck

From: Rui Wang <[email protected]>

commit cb95ea79b3fc772c5873a7a4532ab4c14a455da2 upstream.

This looks like a typo and that caused atomic64 test failed.

Quoted 7 lines

---
I recently enabled atomic CONFIG_ATOMIC64_SELFTEST, which results in a crash when testing 64-bit little endian mips images in v5.10.y. This patch fixes the problem.

 arch/mips/include/asm/atomic.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Now queued up, thanks.

greg k-h