diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-28 10:03:36 -0400 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-28 10:03:36 -0400 |
| commit | da28c12089dfcfb8695b6b555cdb8e03dda2b690 (patch) | |
| tree | b3ff509f21352ef053cb3d490cb13528090d32ac /arch/arm/lib/bitops.h | |
| parent | 6de7dc2c4c713d037c19aa1e310d240f16973414 (diff) | |
| parent | 577a4f8102d54b504cb22eb021b89e957e8df18f (diff) | |
Merge with /home/shaggy/git/linus-clean/
/home/shaggy/git/linus-clean/
/home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
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 |