From 0e360e81b15b7f1f904e9ed265dba9d5c395e347 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Fri, 25 Mar 2011 18:45:13 +0100
Subject: [PATCH] --- yaml --- r: 242431 b: refs/heads/master c:
 756cca61a7faddcafa582d683b46f32280eda948 h: refs/heads/master i:   242429:
 553172cef7d22e2d67c1b58fa6db1a07f5ea739d   242427:
 c9f34cd2b712d5ad6519220663a0874731d0e489   242423:
 4a42f54562b4c95b2c7aebb2ab997bdf07e34cad   242415:
 b3ebe42ae34be6527078ec54d33446c354d9b389   242399:
 1e192e4e7cf2e6f9ae17e8ea47be116fb4e6cc03   242367:
 f368aa407aad91a2309f894cb5b96fcc9be13a7b   242303:
 5d7b8e2c2dded5bf668ba559f0c2314c711d2f6c   242175:
 039da57f2758b33536036a367841d25b55df1bdc v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/mips/include/asm/spinlock.h | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index f7bc0f0cba1b..d8c9bb490aa2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4bafad922ab480d5f86052e679abf5c3ca6dbfa7
+refs/heads/master: 756cca61a7faddcafa582d683b46f32280eda948
diff --git a/trunk/arch/mips/include/asm/spinlock.h b/trunk/arch/mips/include/asm/spinlock.h
index 396e402fbe2c..ca61e846ab0f 100644
--- a/trunk/arch/mips/include/asm/spinlock.h
+++ b/trunk/arch/mips/include/asm/spinlock.h
@@ -245,16 +245,16 @@ static inline void arch_read_lock(arch_rwlock_t *rw)
 		__asm__ __volatile__(
 		"	.set	noreorder	# arch_read_lock	\n"
 		"1:	ll	%1, %2					\n"
-		"	bltz	%1, 2f					\n"
+		"	bltz	%1, 3f					\n"
 		"	 addu	%1, 1					\n"
-		"	sc	%1, %0					\n"
+		"2:	sc	%1, %0					\n"
 		"	beqz	%1, 1b					\n"
 		"	 nop						\n"
 		"	.subsection 2					\n"
-		"2:	ll	%1, %2					\n"
-		"	bltz	%1, 2b					\n"
+		"3:	ll	%1, %2					\n"
+		"	bltz	%1, 3b					\n"
 		"	 addu	%1, 1					\n"
-		"	b	1b					\n"
+		"	b	2b					\n"
 		"	 nop						\n"
 		"	.previous					\n"
 		"	.set	reorder					\n"
@@ -324,16 +324,16 @@ static inline void arch_write_lock(arch_rwlock_t *rw)
 		__asm__ __volatile__(
 		"	.set	noreorder	# arch_write_lock	\n"
 		"1:	ll	%1, %2					\n"
-		"	bnez	%1, 2f					\n"
+		"	bnez	%1, 3f					\n"
 		"	 lui	%1, 0x8000				\n"
-		"	sc	%1, %0					\n"
-		"	beqz	%1, 2f					\n"
+		"2:	sc	%1, %0					\n"
+		"	beqz	%1, 3f					\n"
 		"	 nop						\n"
 		"	.subsection 2					\n"
-		"2:	ll	%1, %2					\n"
-		"	bnez	%1, 2b					\n"
+		"3:	ll	%1, %2					\n"
+		"	bnez	%1, 3b					\n"
 		"	 lui	%1, 0x8000				\n"
-		"	b	1b					\n"
+		"	b	2b					\n"
 		"	 nop						\n"
 		"	.previous					\n"
 		"	.set	reorder					\n"