diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-17 21:47:24 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-17 21:47:24 (GMT) |
| commit | a4e884a311893b476893739901bed382cd62b4fe (patch) | |
| tree | 7b7b52678b61dfdf8e3a16b0e920d1e9b0cae979 /arch/arm/lib/testchangebit.S | |
| parent | ce1dc02f76432a46db149241e015a4f782974623 (diff) | |
| parent | cc56449f53ba45646c6f0a2edf77c4acb342caed (diff) | |
| download | linux-fsl-qoriq-a4e884a311893b476893739901bed382cd62b4fe.tar.xz | |
Merge with master.kernel.org:/home/rmk/linux-2.6-rmk.git - ARM changes
First ever true git merge. Let's see if it actually works.
Diffstat (limited to 'arch/arm/lib/testchangebit.S')
| -rw-r--r-- | arch/arm/lib/testchangebit.S | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/arch/arm/lib/testchangebit.S b/arch/arm/lib/testchangebit.S index 4aba467..b25dcd2 100644 --- a/arch/arm/lib/testchangebit.S +++ b/arch/arm/lib/testchangebit.S @@ -9,21 +9,10 @@ */ #include <linux/linkage.h> #include <asm/assembler.h> +#include "bitops.h" .text ENTRY(_test_and_change_bit_be) eor r0, r0, #0x18 @ big endian byte ordering ENTRY(_test_and_change_bit_le) - add r1, r1, r0, lsr #3 - and r3, r0, #7 - mov r0, #1 - save_and_disable_irqs ip, r2 - ldrb r2, [r1] - tst r2, r0, lsl r3 - eor r2, r2, r0, lsl r3 - strb r2, [r1] - restore_irqs ip - moveq r0, #0 - RETINSTR(mov,pc,lr) - - + testop eor, strb |