5.10-stable patches

added patches:
	mips-locking-atomic-fix-atomic-_64-_sub_if_positive.patch

diff --git a/queue-5.10/mips-locking-atomic-fix-atomic-_64-_sub_if_positive.patch b/queue-5.10/mips-locking-atomic-fix-atomic-_64-_sub_if_positive.patch
new file mode 100644 (file)
index 0000000..d4bd02e
--- /dev/null
+++ b/queue-5.10/mips-locking-atomic-fix-atomic-_64-_sub_if_positive.patch
@@ -0,0 +1,30 @@
+From cb95ea79b3fc772c5873a7a4532ab4c14a455da2 Mon Sep 17 00:00:00 2001
+From: Rui Wang <wangrui@loongson.cn>
+Date: Thu, 29 Jul 2021 17:31:52 +0800
+Subject: MIPS: locking/atomic: Fix atomic{_64,}_sub_if_positive
+
+From: Rui Wang <wangrui@loongson.cn>
+
+commit cb95ea79b3fc772c5873a7a4532ab4c14a455da2 upstream.
+
+This looks like a typo and that caused atomic64 test failed.
+
+Signed-off-by: Rui Wang <wangrui@loongson.cn>
+Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
+Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/mips/include/asm/atomic.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/mips/include/asm/atomic.h
++++ b/arch/mips/include/asm/atomic.h
+@@ -203,7 +203,7 @@ ATOMIC_OPS(atomic64, xor, s64, ^=, xor,
+  * 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;                                              \
+                                                                       \

diff --git a/queue-5.10/series b/queue-5.10/series
index cc0fffbc3255a981a8780fb2fbffad5700dfc26d..f9783eb9923c86a8eb4c0991a36eada48ac8341b 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -61,3 +61,4 @@ revert-ext4-don-t-clear-sb_rdonly-when-remounting-r-w-until-quota-is-re-enabled.
 ext4-only-check-dquot_initialize_needed-when-debugging.patch
 tcp-fix-tcp_min_tso_segs-sysctl.patch
 xfs-verify-buffer-contents-when-we-skip-log-replay.patch
+mips-locking-atomic-fix-atomic-_64-_sub_if_positive.patch