diff --git a/include/asm-mips/system.h b/include/asm-mips/system.h
index dcb4701d572831fe8e7f781d364bd4a524f2b39c..3056feed5a367bcee7f47ec346f3ee62415c6abd 100644
--- a/include/asm-mips/system.h
+++ b/include/asm-mips/system.h
@@ -392,7 +392,7 @@ static inline unsigned long __cmpxchg_u64(volatile int * m, unsigned long old,
 {
 	__u64 retval;
 
-	if (cpu_has_llsc) {
+	if (cpu_has_llsc && R10000_LLSC_WAR) {
 		__asm__ __volatile__(
 		"	.set	push					\n"
 		"	.set	noat					\n"