diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-07-28 04:30:20 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-07-28 04:30:20 -0400 |
| commit | 661299d9d0437a0ff72240f3d60016ac3a361a6e (patch) | |
| tree | 765512576314fc3612b503f182b9ae4e60fcf849 /arch/arm/lib/bitops.h | |
| parent | 05caac585f8abd6c0113856bc8858e3ef214d8a6 (diff) | |
| parent | 41c018b7ecb60b1c2c4d5dee0cd37d32a94c45af (diff) | |
Merge with Linus' 2.6 tree
Diffstat (limited to 'arch/arm/lib/bitops.h')
| -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 |