---

yaml --- r: 11198 b: refs/heads/master c: f99d302 h: refs/heads/master v: v3
git-mirror · Oct 29, 2005 · da13f46 · da13f46
1 parent 540f228
commit da13f46
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e607d6c8b8dd684936fda4b2cc37ad9f9104bed4
+refs/heads/master: f99d3023f317fb3916b46465cc07a0cad3faa0a5
diff --git a/trunk/include/asm-mips/system.h b/trunk/include/asm-mips/system.h
@@ -302,7 +302,9 @@ static inline unsigned long __cmpxchg_u32(volatile int * m, unsigned long old,
 		"	.set	mips3					\n"
 		"1:	ll	%0, %2			# __cmpxchg_u32	\n"
 		"	bne	%0, %z3, 2f				\n"
+		"	.set	mips0					\n"
 		"	move	$1, %z4					\n"
+		"	.set	mips3					\n"
 		"	sc	$1, %1					\n"
 		"	beqzl	$1, 1b					\n"
 #ifdef CONFIG_SMP
@@ -320,7 +322,9 @@ static inline unsigned long __cmpxchg_u32(volatile int * m, unsigned long old,
 		"	.set	mips3					\n"
 		"1:	ll	%0, %2			# __cmpxchg_u32	\n"
 		"	bne	%0, %z3, 2f				\n"
+		"	.set	mips0					\n"
 		"	move	$1, %z4					\n"
+		"	.set	mips3					\n"
 		"	sc	$1, %1					\n"
 		"	beqz	$1, 1b					\n"
 #ifdef CONFIG_SMP