linux-mips
[Top] [All Lists]

MIPS: Fix a R10000_LLSC_WAR logic in atomic.h

Subject: MIPS: Fix a R10000_LLSC_WAR logic in atomic.h
From: Huacai Chen <chenhc@lemote.com>
Date: Tue, 25 Dec 2018 08:51:01 +0800
From: Huacai Chen <chenhc@lemote.com>

commit db1ce3f5d01d2d6d5714aefba0159d2cb5167a0b upstream.

Commit 4936084c2ee2 ("MIPS: Cleanup R10000_LLSC_WAR logic in atomic.h")
introduce a mistake in atomic64_fetch_##op##_relaxed(), because it
forget to delete R10000_LLSC_WAR in the if-condition. So fix it.

Fixes: 4936084c2ee2 ("MIPS: Cleanup R10000_LLSC_WAR logic in atomic.h")
Signed-off-by: Huacai Chen <chenhc@lemote.com>
Signed-off-by: Paul Burton <paul.burton@mips.com>
Cc: Joshua Kinard <kumba@gentoo.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Steven J . Hill <Steven.Hill@cavium.com>
Cc: Fuxin Zhang <zhangfx@lemote.com>
Cc: Zhangjin Wu <wuzhangjin@gmail.com>
Cc: linux-mips@linux-mips.org
Cc: stable@vger.kernel.org # 4.19+
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
@@ -306,7 +306,7 @@ static __inline__ long atomic64_fetch_##
 {                                                                            \
        long result;                                                          \
                                                                              \
-       if (kernel_uses_llsc && R10000_LLSC_WAR) {                            \
+       if (kernel_uses_llsc) {                                               \
                long temp;                                                    \
                                                                              \
                __asm__ __volatile__(                                         \


Patches currently in stable-queue which might be from chenhc@lemote.com are

queue-4.19/mips-c-r4k-add-r4k_blast_scache_node-for-loongson-3.patch
queue-4.19/mips-ensure-pmd_present-returns-false-after-pmd_mknotpresent.patch
queue-4.19/mips-align-kernel-load-address-to-64kb.patch
queue-4.19/mips-fix-a-r10000_llsc_war-logic-in-atomic.h.patch

<Prev in Thread] Current Thread [Next in Thread>
  • MIPS: Fix a R10000_LLSC_WAR logic in atomic.h, Huacai Chen <=