diff options
| author | James Bottomley <jejb@titanic> | 2005-04-18 21:55:09 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic> | 2005-04-18 21:55:09 -0400 |
| commit | c0698f2f6e4839ce9463ce731c892993215ea067 (patch) | |
| tree | b05fc8a950ace937460212e996441e4c05a227f6 /arch/arm/lib/testclearbit.S | |
| parent | cb624029cab62e5415287d15b2ec907b8f322ff5 (diff) | |
| parent | 7f907d7486f2519c2ff1493bfbcdc36dcacd85b7 (diff) | |
fully merge up to scsi-misc-2.6
Diffstat (limited to 'arch/arm/lib/testclearbit.S')
| -rw-r--r-- | arch/arm/lib/testclearbit.S | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/arch/arm/lib/testclearbit.S b/arch/arm/lib/testclearbit.S index e07c5bd24307..2dcc4b16b68e 100644 --- a/arch/arm/lib/testclearbit.S +++ b/arch/arm/lib/testclearbit.S | |||
| @@ -9,21 +9,10 @@ | |||
| 9 | */ | 9 | */ |
| 10 | #include <linux/linkage.h> | 10 | #include <linux/linkage.h> |
| 11 | #include <asm/assembler.h> | 11 | #include <asm/assembler.h> |
| 12 | #include "bitops.h" | ||
| 12 | .text | 13 | .text |
| 13 | 14 | ||
| 14 | ENTRY(_test_and_clear_bit_be) | 15 | ENTRY(_test_and_clear_bit_be) |
| 15 | eor r0, r0, #0x18 @ big endian byte ordering | 16 | eor r0, r0, #0x18 @ big endian byte ordering |
| 16 | ENTRY(_test_and_clear_bit_le) | 17 | ENTRY(_test_and_clear_bit_le) |
| 17 | add r1, r1, r0, lsr #3 @ Get byte offset | 18 | testop bicne, strneb |
| 18 | and r3, r0, #7 @ Get bit offset | ||
| 19 | mov r0, #1 | ||
| 20 | save_and_disable_irqs ip, r2 | ||
| 21 | ldrb r2, [r1] | ||
| 22 | tst r2, r0, lsl r3 | ||
| 23 | bic r2, r2, r0, lsl r3 | ||
| 24 | strb r2, [r1] | ||
| 25 | restore_irqs ip | ||
| 26 | moveq r0, #0 | ||
| 27 | RETINSTR(mov,pc,lr) | ||
| 28 | |||
| 29 | |||