diff options
| author | Huacai Chen <chenhc@lemote.com> | 2018-12-25 01:51:01 +0100 |
|---|---|---|
| committer | Paul Burton <paul.burton@mips.com> | 2018-12-31 16:16:59 +0100 |
| commit | db1ce3f5d01d2d6d5714aefba0159d2cb5167a0b (patch) | |
| tree | 8801ead1c56c12efbcb17690b41e248aa00634cc | |
| parent | MIPS: BCM63XX: drop unused and broken DSP platform device (diff) | |
| download | linux-db1ce3f5d01d2d6d5714aefba0159d2cb5167a0b.tar.xz linux-db1ce3f5d01d2d6d5714aefba0159d2cb5167a0b.zip | |
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 <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+
| -rw-r--r-- | arch/mips/include/asm/atomic.h | 2 |
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__( \ |