diff options
| author | Mark Rutland <mark.rutland@arm.com> | 2018-12-07 18:08:18 +0000 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2018-12-10 11:50:11 +0000 |
| commit | 23fe04c0c58c0432d26fd9c8d974d2fd9ab8a493 (patch) | |
| tree | 61dd9539033d8a56c086c97f372598b097aa1b0c | |
| parent | abb77f3d96407cf30c2068f4a23a14b9540a1c1f (diff) | |
| download | linux-23fe04c0c58c0432d26fd9c8d974d2fd9ab8a493.tar.bz2 | |
arm64: smccc: use asm EXPORT_SYMBOL()
For a while now it's been possible to use EXPORT_SYMBOL() in assembly
files, which allows us to place exports immediately after assembly
functions, as we do for C functions.
As a step towards removing arm64ksyms.c, let's move the SMCCC exports to
the assembly file the functions are defined in.
There should be no functional change as a result of this patch.
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
| -rw-r--r-- | arch/arm64/kernel/arm64ksyms.c | 5 | ||||
| -rw-r--r-- | arch/arm64/kernel/smccc-call.S | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm64/kernel/arm64ksyms.c b/arch/arm64/kernel/arm64ksyms.c index d80e9cfc3062..74e29e69190b 100644 --- a/arch/arm64/kernel/arm64ksyms.c +++ b/arch/arm64/kernel/arm64ksyms.c @@ -26,7 +26,6 @@ #include <linux/syscalls.h> #include <linux/uaccess.h> #include <linux/io.h> -#include <linux/arm-smccc.h> #include <linux/kprobes.h> #include <asm/checksum.h> @@ -64,7 +63,3 @@ EXPORT_SYMBOL(_mcount); NOKPROBE_SYMBOL(_mcount); #endif - /* arm-smccc */ -EXPORT_SYMBOL(__arm_smccc_smc); -EXPORT_SYMBOL(__arm_smccc_hvc); - diff --git a/arch/arm64/kernel/smccc-call.S b/arch/arm64/kernel/smccc-call.S index 62522342e1e4..184332286a81 100644 --- a/arch/arm64/kernel/smccc-call.S +++ b/arch/arm64/kernel/smccc-call.S @@ -13,7 +13,9 @@ */ #include <linux/linkage.h> #include <linux/arm-smccc.h> + #include <asm/asm-offsets.h> +#include <asm/assembler.h> .macro SMCCC instr .cfi_startproc @@ -40,6 +42,7 @@ ENTRY(__arm_smccc_smc) SMCCC smc ENDPROC(__arm_smccc_smc) +EXPORT_SYMBOL(__arm_smccc_smc) /* * void arm_smccc_hvc(unsigned long a0, unsigned long a1, unsigned long a2, @@ -50,3 +53,4 @@ ENDPROC(__arm_smccc_smc) ENTRY(__arm_smccc_hvc) SMCCC hvc ENDPROC(__arm_smccc_hvc) +EXPORT_SYMBOL(__arm_smccc_hvc) |