git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
arm
/
lib
/
io-readsw-armv3.S
diff --git
a/arch/arm/lib/io-readsw-armv3.S
b/arch/arm/lib/io-readsw-armv3.S
index
476cf7f
..
146d47c
100644
(file)
--- a/
arch/arm/lib/io-readsw-armv3.S
+++ b/
arch/arm/lib/io-readsw-armv3.S
@@
-11,16
+11,16
@@
#include <asm/assembler.h>
#include <asm/hardware.h>
#include <asm/assembler.h>
#include <asm/hardware.h>
-.insw_bad_alignment:
- adr r0, .insw_bad_align_msg
+.
L
insw_bad_alignment:
+ adr r0, .
L
insw_bad_align_msg
mov r2, lr
b panic
mov r2, lr
b panic
-.insw_bad_align_msg:
+.
L
insw_bad_align_msg:
.asciz "insw: bad buffer alignment (0x%p, lr=0x%08lX)\n"
.align
.asciz "insw: bad buffer alignment (0x%p, lr=0x%08lX)\n"
.align
-.
insw_align:
tst r1, #1
- bne .insw_bad_alignment
+.
Linsw_align:
tst r1, #1
+ bne .
L
insw_bad_alignment
ldr r3, [r0]
strb r3, [r1], #1
ldr r3, [r0]
strb r3, [r1], #1
@@
-34,16
+34,16
@@
ENTRY(__raw_readsw)
teq r2, #0 @ do we have to check for the zero len?
moveq pc, lr
tst r1, #3
teq r2, #0 @ do we have to check for the zero len?
moveq pc, lr
tst r1, #3
- bne .insw_align
+ bne .
L
insw_align
-.
insw_aligned:
mov ip, #0xff
+.
Linsw_aligned:
mov ip, #0xff
orr ip, ip, ip, lsl #8
stmfd sp!, {r4, r5, r6, lr}
subs r2, r2, #8
orr ip, ip, ip, lsl #8
stmfd sp!, {r4, r5, r6, lr}
subs r2, r2, #8
- bmi .no_insw_8
+ bmi .
L
no_insw_8
-.
insw_8_lp:
ldr r3, [r0]
+.
Linsw_8_lp:
ldr r3, [r0]
and r3, r3, ip
ldr r4, [r0]
orr r3, r3, r4, lsl #16
and r3, r3, ip
ldr r4, [r0]
orr r3, r3, r4, lsl #16
@@
-66,13
+66,13
@@
ENTRY(__raw_readsw)
stmia r1!, {r3 - r6}
subs r2, r2, #8
stmia r1!, {r3 - r6}
subs r2, r2, #8
- bpl .insw_8_lp
+ bpl .
L
insw_8_lp
tst r2, #7
LOADREGS(eqfd, sp!, {r4, r5, r6, pc})
tst r2, #7
LOADREGS(eqfd, sp!, {r4, r5, r6, pc})
-.
no_insw_8:
tst r2, #4
- beq .no_insw_4
+.
Lno_insw_8:
tst r2, #4
+ beq .
L
no_insw_4
ldr r3, [r0]
and r3, r3, ip
ldr r3, [r0]
and r3, r3, ip
@@
-86,8
+86,8
@@
ENTRY(__raw_readsw)
stmia r1!, {r3, r4}
stmia r1!, {r3, r4}
-.
no_insw_4:
tst r2, #2
- beq .no_insw_2
+.
Lno_insw_4:
tst r2, #2
+ beq .
L
no_insw_2
ldr r3, [r0]
and r3, r3, ip
ldr r3, [r0]
and r3, r3, ip
@@
-96,7
+96,7
@@
ENTRY(__raw_readsw)
str r3, [r1], #4
str r3, [r1], #4
-.
no_insw_2:
tst r2, #1
+.
Lno_insw_2:
tst r2, #1
ldrne r3, [r0]
strneb r3, [r1], #1
movne r3, r3, lsr #8
ldrne r3, [r0]
strneb r3, [r1], #1
movne r3, r3, lsr #8