summaryrefslogtreecommitdiffstats
path: root/include/asm-mips/spinlock.h
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2005-04-14 15:28:28 +0000
committerRalf Baechle <ralf@linux-mips.org>2005-10-29 19:31:08 +0100
commitb63014ad2dfd137ac38210c7c5cda7ecc3f536d0 (patch)
tree6943cb448f9e9cc8ef8c665f4c87b3842c7fb318 /include/asm-mips/spinlock.h
parent93b25d0621560012ff60a95ae265823b3a5e811a (diff)
downloadlinux-b63014ad2dfd137ac38210c7c5cda7ecc3f536d0.tar.gz
linux-b63014ad2dfd137ac38210c7c5cda7ecc3f536d0.tar.bz2
linux-b63014ad2dfd137ac38210c7c5cda7ecc3f536d0.zip
Move sync into the delay slot here also.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'include/asm-mips/spinlock.h')
-rw-r--r--include/asm-mips/spinlock.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/include/asm-mips/spinlock.h b/include/asm-mips/spinlock.h
index 075e9701d6bc..7d1cc75a1cbb 100644
--- a/include/asm-mips/spinlock.h
+++ b/include/asm-mips/spinlock.h
@@ -209,8 +209,7 @@ static inline void __raw_write_lock(raw_rwlock_t *rw)
" lui %1, 0x8000 \n"
" sc %1, %0 \n"
" beqzl %1, 1b \n"
- " nop \n"
- " sync \n"
+ " sync \n"
" .set reorder \n"
: "=m" (rw->lock), "=&r" (tmp)
: "m" (rw->lock)
@@ -223,8 +222,7 @@ static inline void __raw_write_lock(raw_rwlock_t *rw)
" lui %1, 0x8000 \n"
" sc %1, %0 \n"
" beqz %1, 1b \n"
- " nop \n"
- " sync \n"
+ " sync \n"
" .set reorder \n"
: "=m" (rw->lock), "=&r" (tmp)
: "m" (rw->lock)
@@ -258,8 +256,7 @@ static inline int __raw_write_trylock(raw_rwlock_t *rw)
" lui %1, 0x8000 \n"
" sc %1, %0 \n"
" beqzl %1, 1b \n"
- " nop \n"
- " sync \n"
+ " sync \n"
" li %2, 1 \n"
" .set reorder \n"
"2: \n"