diff options
| author | Roland Dreier <roland@eddore.topspincom.com> | 2005-07-27 22:12:56 -0400 |
|---|---|---|
| committer | Roland Dreier <roland@eddore.topspincom.com> | 2005-07-27 22:12:56 -0400 |
| commit | 2868bd281fef21d1e73d6b7648a41efc3d75f10c (patch) | |
| tree | 0ad821cfcc9e3f9e8b662d026bec6bb6d4ce69ac /arch/arm/lib | |
| parent | 6d376756f2cf3478d5a4fdb8d18e958948366b9d (diff) | |
| parent | 41c018b7ecb60b1c2c4d5dee0cd37d32a94c45af (diff) | |
Merge /scratch/Ksrc/linux-git/
Diffstat (limited to 'arch/arm/lib')
| -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 |