aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2006-10-13 11:32:50 +0100
committerRalf Baechle <ralf@linux-mips.org>2006-11-02 17:23:33 +0000
commit904880e717c5466041485ca6d6e8c6c1ef06d0fd (patch)
treeb85b7025bad2bcce348c208b8b0fdd137aa2132a /include
parent[MIPS] Ocelot G: Fix : "CURRENTLY_UNUSED" is not defined warning. (diff)
downloadlinux-dev-904880e717c5466041485ca6d6e8c6c1ef06d0fd.tar.xz
linux-dev-904880e717c5466041485ca6d6e8c6c1ef06d0fd.zip
[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 <ralf@linux-mips.org>
Diffstat (limited to 'include')
-rw-r--r--include/asm-mips/system.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/system.h b/include/asm-mips/system.h
index dcb4701d5728..3056feed5a36 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"