summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-03 15:43:17 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-03 15:43:17 -0700
commitc7659e2c139d0be4647bef89188a932e0254d709 (patch)
tree7af831479e9369852f05f6feec07ee7d51e57bc8 /arch
parent66b1f1a982bf4dbad9fa0de25b8d95c4936f05c4 (diff)
parent9ea0f043fec38fadb0101fbf29563a5635f42e93 (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] Terminally fix local_{dec,sub}_if_positive [MIPS] Type proof reimplementation of cmpxchg. [MIPS] pg-r4k.c: Fix a typo in an R4600 v2 erratum workaround
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/mm/pg-r4k.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/mm/pg-r4k.c b/arch/mips/mm/pg-r4k.c
index dc795be62807..e47e9e9486bf 100644
--- a/arch/mips/mm/pg-r4k.c
+++ b/arch/mips/mm/pg-r4k.c
@@ -209,7 +209,7 @@ static inline void build_cdex_p(void)
}
if (R4600_V2_HIT_CACHEOP_WAR && cpu_is_r4600_v2_x())
- build_insn_word(0x3c01a000); /* lui $at, 0xa000 */
+ build_insn_word(0x8c200000); /* lw $zero, ($at) */
mi.c_format.opcode = cache_op;
mi.c_format.rs = 4; /* $a0 */