aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHuacai Chen <[email protected]>2018-12-25 08:51:01 +0800
committerPaul Burton <[email protected]>2018-12-31 07:16:59 -0800
commitdb1ce3f5d01d2d6d5714aefba0159d2cb5167a0b (patch)
tree8801ead1c56c12efbcb17690b41e248aa00634cc
parent682fee802843b332f9c51ffc8e062de5ff773f2e (diff)
MIPS: Fix a R10000_LLSC_WAR logic in atomic.h
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 <[email protected]> Signed-off-by: Paul Burton <[email protected]> Cc: Joshua Kinard <[email protected]> Cc: Ralf Baechle <[email protected]> Cc: Steven J . Hill <[email protected]> Cc: Fuxin Zhang <[email protected]> Cc: Zhangjin Wu <[email protected]> Cc: [email protected] Cc: [email protected] # 4.19+
-rw-r--r--arch/mips/include/asm/atomic.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h
index e8fbfd419151..43fcd35e2957 100644
--- a/arch/mips/include/asm/atomic.h
+++ b/arch/mips/include/asm/atomic.h
@@ -313,7 +313,7 @@ static __inline__ long atomic64_fetch_##op##_relaxed(long i, atomic64_t * v) \
{ \
long result; \
\
- if (kernel_uses_llsc && R10000_LLSC_WAR) { \
+ if (kernel_uses_llsc) { \
long temp; \
\
__asm__ __volatile__( \