diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-10 04:12:10 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-10 04:12:10 -0500 |
| commit | 2f67bdb23d74a6c6fd4f98f64239c5c34d1833cc (patch) | |
| tree | fe533abe3e7c400848647b95e4806f5125c654c3 /arch/arm/lib | |
| parent | d40d9d29c020f8466c96f8e3ad4b7c014ff1085d (diff) | |
| parent | 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/arm/lib')
| -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 |