From: Ralf Baechle Date: Fri, 13 Oct 2006 10:32:50 +0000 (+0100) Subject: [MIPS] Don't use R10000 llsc workaround version for all llsc-full processors. X-Git-Tag: v2.6.19-rc5~66^2~1 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=904880e717c5466041485ca6d6e8c6c1ef06d0fd;p=linux-2.6-omap-h63xx.git [MIPS] Don't use R10000 llsc workaround version for all llsc-full processors. Found and original patch by bile@landofbile.com. Signed-off-by: Ralf Baechle --- diff --git a/include/asm-mips/system.h b/include/asm-mips/system.h index dcb4701d572..3056feed5a3 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"