diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 10:40:14 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 10:40:14 -0400 |
| commit | ff877ea80efa2015b6263766f78ee42c2a1b32f9 (patch) | |
| tree | 85205005c611ab774702148558321c6fb92f1ccd /include/asm-mips/bitops.h | |
| parent | 30821fee4f0cb3e6d241d9f7ddc37742212e3eb7 (diff) | |
| parent | d37e6bf68fc1eb34a4ad21d9ae8890ed37ea80e7 (diff) | |
Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6
Diffstat (limited to 'include/asm-mips/bitops.h')
| -rw-r--r-- | include/asm-mips/bitops.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/bitops.h b/include/asm-mips/bitops.h index 642724734eba..49df8c4c9d25 100644 --- a/include/asm-mips/bitops.h +++ b/include/asm-mips/bitops.h | |||
| @@ -428,7 +428,7 @@ static inline int test_and_clear_bit(unsigned long nr, | |||
| 428 | "2: b 1b \n" | 428 | "2: b 1b \n" |
| 429 | " .previous \n" | 429 | " .previous \n" |
| 430 | : "=&r" (temp), "=m" (*m), "=&r" (res) | 430 | : "=&r" (temp), "=m" (*m), "=&r" (res) |
| 431 | : "ri" (bit), "m" (*m) | 431 | : "ir" (bit), "m" (*m) |
| 432 | : "memory"); | 432 | : "memory"); |
| 433 | #endif | 433 | #endif |
| 434 | } else if (cpu_has_llsc) { | 434 | } else if (cpu_has_llsc) { |