diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-04 12:51:51 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-04 12:51:51 -0400 |
| commit | 638944adc169b3164399a7c1aa98bb48fa070e41 (patch) | |
| tree | 70f09ef2b5af667aaf5b60de2dc9697003ab106c | |
| parent | 3ea9eed49346eb80f17f1c6539c47dc508be1173 (diff) | |
| parent | 50952026036c7b4212b90091bf23a264c0ccc1fb (diff) | |
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.
| -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) | |||
| 283 | " beqz %0, 2f \n" | 283 | " beqz %0, 2f \n" |
| 284 | " subu %0, %1, %3 \n" | 284 | " subu %0, %1, %3 \n" |
| 285 | " .set reorder \n" | 285 | " .set reorder \n" |
| 286 | "1: \n" | ||
| 287 | " .subsection 2 \n" | 286 | " .subsection 2 \n" |
| 288 | "2: b 1b \n" | 287 | "2: b 1b \n" |
| 289 | " .previous \n" | 288 | " .previous \n" |
| 289 | "1: \n" | ||
| 290 | " .set mips0 \n" | 290 | " .set mips0 \n" |
| 291 | : "=&r" (result), "=&r" (temp), "=m" (v->counter) | 291 | : "=&r" (result), "=&r" (temp), "=m" (v->counter) |
| 292 | : "Ir" (i), "m" (v->counter) | 292 | : "Ir" (i), "m" (v->counter) |
| @@ -664,10 +664,10 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v) | |||
| 664 | " beqz %0, 2f \n" | 664 | " beqz %0, 2f \n" |
| 665 | " dsubu %0, %1, %3 \n" | 665 | " dsubu %0, %1, %3 \n" |
| 666 | " .set reorder \n" | 666 | " .set reorder \n" |
| 667 | "1: \n" | ||
| 668 | " .subsection 2 \n" | 667 | " .subsection 2 \n" |
| 669 | "2: b 1b \n" | 668 | "2: b 1b \n" |
| 670 | " .previous \n" | 669 | " .previous \n" |
| 670 | "1: \n" | ||
| 671 | " .set mips0 \n" | 671 | " .set mips0 \n" |
| 672 | : "=&r" (result), "=&r" (temp), "=m" (v->counter) | 672 | : "=&r" (result), "=&r" (temp), "=m" (v->counter) |
| 673 | : "Ir" (i), "m" (v->counter) | 673 | : "Ir" (i), "m" (v->counter) |