diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-04 09:51:51 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-04 09:51:51 -0700 |
commit | 638944adc169b3164399a7c1aa98bb48fa070e41 (patch) | |
tree | 70f09ef2b5af667aaf5b60de2dc9697003ab106c /include | |
parent | 3ea9eed49346eb80f17f1c6539c47dc508be1173 (diff) | |
parent | 50952026036c7b4212b90091bf23a264c0ccc1fb (diff) | |
download | linux-638944adc169b3164399a7c1aa98bb48fa070e41.tar.bz2 |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Fix bug in atomic_sub_if_positive.
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-mips/atomic.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-mips/atomic.h b/include/asm-mips/atomic.h index a798d6299a79..1232be3885b0 100644 --- a/include/asm-mips/atomic.h +++ b/include/asm-mips/atomic.h @@ -283,10 +283,10 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v) " beqz %0, 2f \n" " subu %0, %1, %3 \n" " .set reorder \n" - "1: \n" " .subsection 2 \n" "2: b 1b \n" " .previous \n" + "1: \n" " .set mips0 \n" : "=&r" (result), "=&r" (temp), "=m" (v->counter) : "Ir" (i), "m" (v->counter) @@ -664,10 +664,10 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v) " beqz %0, 2f \n" " dsubu %0, %1, %3 \n" " .set reorder \n" - "1: \n" " .subsection 2 \n" "2: b 1b \n" " .previous \n" + "1: \n" " .set mips0 \n" : "=&r" (result), "=&r" (temp), "=m" (v->counter) : "Ir" (i), "m" (v->counter) |