diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-27 19:36:08 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-27 19:36:08 -0400 |
| commit | 3334c39f1815d2911238c43f40840c3c7b378165 (patch) | |
| tree | 19555dab8c2811141b4070f30c0723d17965a162 | |
| parent | 71b2c86f5fd22b27feaa6c19c2c6662480ecd7d5 (diff) | |
| parent | 614d73edae68836f7659ee8efec90878e6215fb1 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm-smp
| -rw-r--r-- | arch/arm/lib/bitops.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/lib/bitops.h b/arch/arm/lib/bitops.h index 6976e60e47cb..5382a3023602 100644 --- a/arch/arm/lib/bitops.h +++ b/arch/arm/lib/bitops.h | |||
| @@ -19,9 +19,9 @@ | |||
| 19 | mov r3, r2, lsl r3 @ create mask | 19 | mov r3, r2, lsl r3 @ create mask |
| 20 | 1: ldrexb r2, [r1] | 20 | 1: ldrexb r2, [r1] |
| 21 | ands r0, r2, r3 @ save old value of bit | 21 | ands r0, r2, r3 @ save old value of bit |
| 22 | \instr ip, r2, r3 @ toggle bit | 22 | \instr r2, r2, r3 @ toggle bit |
| 23 | strexb r2, ip, [r1] | 23 | strexb ip, r2, [r1] |
| 24 | cmp r2, #0 | 24 | cmp ip, #0 |
| 25 | bne 1b | 25 | bne 1b |
| 26 | cmp r0, #0 | 26 | cmp r0, #0 |
| 27 | movne r0, #1 | 27 | movne r0, #1 |