mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-31 16:38:12 +00:00
8478132a87
This reverts commit 4dd1837d75
.
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>
53 lines
1.1 KiB
ArmAsm
53 lines
1.1 KiB
ArmAsm
/*
|
|
* linux/arch/arm/lib/csumpartialcopy.S
|
|
*
|
|
* Copyright (C) 1995-1998 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>
|
|
|
|
.text
|
|
|
|
/* Function: __u32 csum_partial_copy_nocheck(const char *src, char *dst, int len, __u32 sum)
|
|
* Params : r0 = src, r1 = dst, r2 = len, r3 = checksum
|
|
* Returns : r0 = new checksum
|
|
*/
|
|
|
|
.macro save_regs
|
|
stmfd sp!, {r1, r4 - r8, lr}
|
|
.endm
|
|
|
|
.macro load_regs
|
|
ldmfd sp!, {r1, r4 - r8, pc}
|
|
.endm
|
|
|
|
.macro load1b, reg1
|
|
ldrb \reg1, [r0], #1
|
|
.endm
|
|
|
|
.macro load2b, reg1, reg2
|
|
ldrb \reg1, [r0], #1
|
|
ldrb \reg2, [r0], #1
|
|
.endm
|
|
|
|
.macro load1l, reg1
|
|
ldr \reg1, [r0], #4
|
|
.endm
|
|
|
|
.macro load2l, reg1, reg2
|
|
ldr \reg1, [r0], #4
|
|
ldr \reg2, [r0], #4
|
|
.endm
|
|
|
|
.macro load4l, reg1, reg2, reg3, reg4
|
|
ldmia r0!, {\reg1, \reg2, \reg3, \reg4}
|
|
.endm
|
|
|
|
#define FN_ENTRY ENTRY(csum_partial_copy_nocheck)
|
|
#define FN_EXIT ENDPROC(csum_partial_copy_nocheck)
|
|
|
|
#include "csumpartialcopygeneric.S"
|