From 1822b53fc8b37e32774ce9a10a35d7796404c92e Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Thu, 14 Apr 2005 15:28:28 +0000
Subject: [PATCH] --- yaml --- r: 11071 b: refs/heads/master c:
 b63014ad2dfd137ac38210c7c5cda7ecc3f536d0 h: refs/heads/master i:   11069:
 776f89a3b23db71e46c89e53b290abd59c7260a4   11067:
 204b21c675121de58ca699bbd8672c469ebe71aa   11063:
 0ea2a4f4b0298455beca12db6adf363fc8695879   11055:
 c1549e61344f9841db6ad7c871d875a1e03ceb57   11039:
 88d4e9159e228dff141d03b8a9a81b75534d6b0f   11007:
 52697f9c2b089b35479e1870a72a08b76b61cf04 v: v3

---
 [refs]                            | 2 +-
 trunk/include/asm-mips/spinlock.h | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index f76b4bab4b84..59a265f91621 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93b25d0621560012ff60a95ae265823b3a5e811a
+refs/heads/master: b63014ad2dfd137ac38210c7c5cda7ecc3f536d0
diff --git a/trunk/include/asm-mips/spinlock.h b/trunk/include/asm-mips/spinlock.h
index 075e9701d6bc..7d1cc75a1cbb 100644
--- a/trunk/include/asm-mips/spinlock.h
+++ b/trunk/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"