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/setbit.S | |
| parent | ce1dc02f76432a46db149241e015a4f782974623 (diff) | |
| parent | cc56449f53ba45646c6f0a2edf77c4acb342caed (diff) | |
| download | linux-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/setbit.S')
| -rw-r--r-- | arch/arm/lib/setbit.S | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/arch/arm/lib/setbit.S b/arch/arm/lib/setbit.S index 8f337df..83bc23d 100644 --- a/arch/arm/lib/setbit.S +++ b/arch/arm/lib/setbit.S @@ -9,6 +9,7 @@ */ #include <linux/linkage.h> #include <asm/assembler.h> +#include "bitops.h" .text /* @@ -18,12 +19,4 @@ ENTRY(_set_bit_be) eor r0, r0, #0x18 @ big endian byte ordering ENTRY(_set_bit_le) - and r2, r0, #7 - mov r3, #1 - mov r3, r3, lsl r2 - save_and_disable_irqs ip, r2 - ldrb r2, [r1, r0, lsr #3] - orr r2, r2, r3 - strb r2, [r1, r0, lsr #3] - restore_irqs ip - RETINSTR(mov,pc,lr) + bitop orr |