mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-12 00:38:55 +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>
63 lines
1.5 KiB
ArmAsm
63 lines
1.5 KiB
ArmAsm
/*
|
|
* Copyright (c) 2015, Linaro Limited
|
|
*
|
|
* This software is licensed under the terms of the GNU General Public
|
|
* License version 2, as published by the Free Software Foundation, and
|
|
* may be copied, distributed, and modified under those terms.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
*/
|
|
#include <linux/linkage.h>
|
|
|
|
#include <asm/opcodes-sec.h>
|
|
#include <asm/opcodes-virt.h>
|
|
#include <asm/unwind.h>
|
|
|
|
/*
|
|
* Wrap c macros in asm macros to delay expansion until after the
|
|
* SMCCC asm macro is expanded.
|
|
*/
|
|
.macro SMCCC_SMC
|
|
__SMC(0)
|
|
.endm
|
|
|
|
.macro SMCCC_HVC
|
|
__HVC(0)
|
|
.endm
|
|
|
|
.macro SMCCC instr
|
|
UNWIND( .fnstart)
|
|
mov r12, sp
|
|
push {r4-r7}
|
|
UNWIND( .save {r4-r7})
|
|
ldm r12, {r4-r7}
|
|
\instr
|
|
pop {r4-r7}
|
|
ldr r12, [sp, #(4 * 4)]
|
|
stm r12, {r0-r3}
|
|
bx lr
|
|
UNWIND( .fnend)
|
|
.endm
|
|
|
|
/*
|
|
* void smccc_smc(unsigned long a0, unsigned long a1, unsigned long a2,
|
|
* unsigned long a3, unsigned long a4, unsigned long a5,
|
|
* unsigned long a6, unsigned long a7, struct arm_smccc_res *res)
|
|
*/
|
|
ENTRY(arm_smccc_smc)
|
|
SMCCC SMCCC_SMC
|
|
ENDPROC(arm_smccc_smc)
|
|
|
|
/*
|
|
* void smccc_hvc(unsigned long a0, unsigned long a1, unsigned long a2,
|
|
* unsigned long a3, unsigned long a4, unsigned long a5,
|
|
* unsigned long a6, unsigned long a7, struct arm_smccc_res *res)
|
|
*/
|
|
ENTRY(arm_smccc_hvc)
|
|
SMCCC SMCCC_HVC
|
|
ENDPROC(arm_smccc_hvc)
|