mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-13 01:08:50 +00:00
8478132a87
This reverts commit 4dd1837d7589f468ed109556513f476e7a7f9121.
Moving the exports for assembly code into the assembly files breaks
KSYM trimming, but also breaks modversions.
While fixing the KSYM trimming is trivial, fixing modversions brings
us to a technically worse position that we had prior to the above
change:
- We end up with the prototype definitions divorsed from everything
else, which means that adding or removing assembly level ksyms
become more fragile:
* if adding a new assembly ksyms export, a missed prototype in
asm-prototypes.h results in a successful build if no module in
the selected configuration makes use of the symbol.
* when removing a ksyms export, asm-prototypes.h will get forgotten,
with armksyms.c, you'll get a build error if you forget to touch
the file.
- We end up with the same amount of include files and prototypes,
they're just in a header file instead of a .c file with their
exports.
As for lines of code, we don't get much of a size reduction:
(original commit)
47 files changed, 131 insertions(+), 208 deletions(-)
(fix for ksyms trimming)
7 files changed, 18 insertions(+), 5 deletions(-)
(two fixes for modversions)
1 file changed, 34 insertions(+)
3 files changed, 7 insertions(+), 2 deletions(-)
which results in a net total of only 25 lines deleted.
As there does not seem to be much benefit from this change of approach,
revert the change.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
107 lines
1.8 KiB
ArmAsm
107 lines
1.8 KiB
ArmAsm
/*
|
|
* linux/arch/arm/lib/io-readsw-armv3.S
|
|
*
|
|
* Copyright (C) 1995-2000 Russell King
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
#include <linux/linkage.h>
|
|
#include <asm/assembler.h>
|
|
|
|
.Linsw_bad_alignment:
|
|
adr r0, .Linsw_bad_align_msg
|
|
mov r2, lr
|
|
b panic
|
|
.Linsw_bad_align_msg:
|
|
.asciz "insw: bad buffer alignment (0x%p, lr=0x%08lX)\n"
|
|
.align
|
|
|
|
.Linsw_align: tst r1, #1
|
|
bne .Linsw_bad_alignment
|
|
|
|
ldr r3, [r0]
|
|
strb r3, [r1], #1
|
|
mov r3, r3, lsr #8
|
|
strb r3, [r1], #1
|
|
|
|
subs r2, r2, #1
|
|
reteq lr
|
|
|
|
ENTRY(__raw_readsw)
|
|
teq r2, #0 @ do we have to check for the zero len?
|
|
reteq lr
|
|
tst r1, #3
|
|
bne .Linsw_align
|
|
|
|
.Linsw_aligned: mov ip, #0xff
|
|
orr ip, ip, ip, lsl #8
|
|
stmfd sp!, {r4, r5, r6, lr}
|
|
|
|
subs r2, r2, #8
|
|
bmi .Lno_insw_8
|
|
|
|
.Linsw_8_lp: ldr r3, [r0]
|
|
and r3, r3, ip
|
|
ldr r4, [r0]
|
|
orr r3, r3, r4, lsl #16
|
|
|
|
ldr r4, [r0]
|
|
and r4, r4, ip
|
|
ldr r5, [r0]
|
|
orr r4, r4, r5, lsl #16
|
|
|
|
ldr r5, [r0]
|
|
and r5, r5, ip
|
|
ldr r6, [r0]
|
|
orr r5, r5, r6, lsl #16
|
|
|
|
ldr r6, [r0]
|
|
and r6, r6, ip
|
|
ldr lr, [r0]
|
|
orr r6, r6, lr, lsl #16
|
|
|
|
stmia r1!, {r3 - r6}
|
|
|
|
subs r2, r2, #8
|
|
bpl .Linsw_8_lp
|
|
|
|
tst r2, #7
|
|
ldmeqfd sp!, {r4, r5, r6, pc}
|
|
|
|
.Lno_insw_8: tst r2, #4
|
|
beq .Lno_insw_4
|
|
|
|
ldr r3, [r0]
|
|
and r3, r3, ip
|
|
ldr r4, [r0]
|
|
orr r3, r3, r4, lsl #16
|
|
|
|
ldr r4, [r0]
|
|
and r4, r4, ip
|
|
ldr r5, [r0]
|
|
orr r4, r4, r5, lsl #16
|
|
|
|
stmia r1!, {r3, r4}
|
|
|
|
.Lno_insw_4: tst r2, #2
|
|
beq .Lno_insw_2
|
|
|
|
ldr r3, [r0]
|
|
and r3, r3, ip
|
|
ldr r4, [r0]
|
|
orr r3, r3, r4, lsl #16
|
|
|
|
str r3, [r1], #4
|
|
|
|
.Lno_insw_2: tst r2, #1
|
|
ldrne r3, [r0]
|
|
strneb r3, [r1], #1
|
|
movne r3, r3, lsr #8
|
|
strneb r3, [r1]
|
|
|
|
ldmfd sp!, {r4, r5, r6, pc}
|
|
|
|
|