diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 11:55:53 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 11:55:53 -0500 |
| commit | ac111bfaa6b0b3c0edc63c27bd9617d6b08851ff (patch) | |
| tree | 69c98b53ce9f269952d3e6f1f39fdba4b3d96544 /arch/arm/lib/bitops.h | |
| parent | 19da9b8b6ef80e4b1f870c0d270df32571fdaad6 (diff) | |
| parent | 861e37ad5969f764574722f4cfc0734511cbac7f (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/lib/bitops.h')
| -rw-r--r-- | arch/arm/lib/bitops.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/lib/bitops.h b/arch/arm/lib/bitops.h index f35d91fbe117..b8c14e936697 100644 --- a/arch/arm/lib/bitops.h +++ b/arch/arm/lib/bitops.h | |||
| @@ -34,7 +34,7 @@ | |||
| 34 | and r2, r0, #7 | 34 | and r2, r0, #7 |
| 35 | mov r3, #1 | 35 | mov r3, #1 |
| 36 | mov r3, r3, lsl r2 | 36 | mov r3, r3, lsl r2 |
| 37 | save_and_disable_irqs ip, r2 | 37 | save_and_disable_irqs ip |
| 38 | ldrb r2, [r1, r0, lsr #3] | 38 | ldrb r2, [r1, r0, lsr #3] |
| 39 | \instr r2, r2, r3 | 39 | \instr r2, r2, r3 |
| 40 | strb r2, [r1, r0, lsr #3] | 40 | strb r2, [r1, r0, lsr #3] |
| @@ -54,7 +54,7 @@ | |||
| 54 | add r1, r1, r0, lsr #3 | 54 | add r1, r1, r0, lsr #3 |
| 55 | and r3, r0, #7 | 55 | and r3, r0, #7 |
| 56 | mov r0, #1 | 56 | mov r0, #1 |
| 57 | save_and_disable_irqs ip, r2 | 57 | save_and_disable_irqs ip |
| 58 | ldrb r2, [r1] | 58 | ldrb r2, [r1] |
| 59 | tst r2, r0, lsl r3 | 59 | tst r2, r0, lsl r3 |
| 60 | \instr r2, r2, r0, lsl r3 | 60 | \instr r2, r2, r0, lsl r3 |