summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-11-02 10:14:37 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-11-02 10:14:37 -0800
commite957b00a8caece90cbc2afd0a4cb4c4d61b9efa8 (patch)
tree3c8388217251e9d408b0cd93d3dd0620eb77962e /include
parent096e5bdaf166791e128ed3b9190542412559333b (diff)
parent236d333c3c05c179e31f461285c09271256a1381 (diff)
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] Do not use -msym32 option for modules. [MIPS] Don't use R10000 llsc workaround version for all llsc-full processors. [MIPS] Ocelot G: Fix : "CURRENTLY_UNUSED" is not defined warning. [MIPS] Fix warning about init_initrd() call if !CONFIG_BLK_DEV_INITRD. [MIPS] IP27: Allow SMP ;-) Another changeset messed up by patch. [MIPS] Fix merge screwup by patch(1) Revert "[MIPS] Make SPARSEMEM selectable on QEMU."
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"