From da13f460e373a2f105fe1d0fbcb08e3deb52908a Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Thu, 25 Aug 2005 16:22:09 +0000 Subject: [PATCH] --- yaml --- r: 11198 b: refs/heads/master c: f99d3023f317fb3916b46465cc07a0cad3faa0a5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-mips/system.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1a3b4c735fc8..e2fddc1c8b81 100644 --- 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 index b1ac3f5bfc3b..b126545e96ed 100644 --- 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