diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-19 23:05:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-19 23:05:16 -0400 |
| commit | f32e3555834c4bc95fccba1aa245d95b3a0a0bc8 (patch) | |
| tree | 9500951ff367f40604f19608490466da1f2607c5 /include | |
| parent | 511b00a3194167bad447d4c81027d6a44920dfd2 (diff) | |
| parent | 0803c30c23d39e1db88d06ef59c30fa5ef6c3ada (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 4264/1: ldrex/strex syntax errors with recent compilers
[ARM] Fix breakage caused by 72486f1f8f0a2bc828b9d30cf4690cf2dd6807fc
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/atomic.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-arm/atomic.h b/include/asm-arm/atomic.h index ea88aa6bfc78..f266c2795124 100644 --- a/include/asm-arm/atomic.h +++ b/include/asm-arm/atomic.h | |||
| @@ -103,9 +103,9 @@ static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr) | |||
| 103 | unsigned long tmp, tmp2; | 103 | unsigned long tmp, tmp2; |
| 104 | 104 | ||
| 105 | __asm__ __volatile__("@ atomic_clear_mask\n" | 105 | __asm__ __volatile__("@ atomic_clear_mask\n" |
| 106 | "1: ldrex %0, %2\n" | 106 | "1: ldrex %0, [%2]\n" |
| 107 | " bic %0, %0, %3\n" | 107 | " bic %0, %0, %3\n" |
| 108 | " strex %1, %0, %2\n" | 108 | " strex %1, %0, [%2]\n" |
| 109 | " teq %1, #0\n" | 109 | " teq %1, #0\n" |
| 110 | " bne 1b" | 110 | " bne 1b" |
| 111 | : "=&r" (tmp), "=&r" (tmp2) | 111 | : "=&r" (tmp), "=&r" (tmp2) |