Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23fe04c0 authored Dec 07, 2018 by Mark Rutland Committed by Will Deacon Dec 10, 2018

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>

parent abb77f3d

arch/arm64/kernel/arm64ksyms.c

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -26,7 +26,6 @@
	#include <linux/syscalls.h>		#include <linux/syscalls.h>
	#include <linux/uaccess.h>		#include <linux/uaccess.h>
	#include <linux/io.h>		#include <linux/io.h>
	#include <linux/arm-smccc.h>
	#include <linux/kprobes.h>		#include <linux/kprobes.h>

	#include <asm/checksum.h>		#include <asm/checksum.h>
	@@ -64,7 +63,3 @@ EXPORT_SYMBOL(_mcount);
	NOKPROBE_SYMBOL(_mcount);		NOKPROBE_SYMBOL(_mcount);
	#endif		#endif

	/* arm-smccc */
	EXPORT_SYMBOL(__arm_smccc_smc);
	EXPORT_SYMBOL(__arm_smccc_hvc);

arch/arm64/kernel/smccc-call.S

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -13,7 +13,9 @@
	*/		*/
	#include <linux/linkage.h>		#include <linux/linkage.h>
	#include <linux/arm-smccc.h>		#include <linux/arm-smccc.h>

	#include <asm/asm-offsets.h>		#include <asm/asm-offsets.h>
			#include <asm/assembler.h>

	.macro SMCCC instr		.macro SMCCC instr
	.cfi_startproc		.cfi_startproc
	@@ -40,6 +42,7 @@
	ENTRY(__arm_smccc_smc)		ENTRY(__arm_smccc_smc)
	SMCCC smc		SMCCC smc
	ENDPROC(__arm_smccc_smc)		ENDPROC(__arm_smccc_smc)
			EXPORT_SYMBOL(__arm_smccc_smc)

	/*		/*
	* void arm_smccc_hvc(unsigned long a0, unsigned long a1, unsigned long a2,		* 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)		ENTRY(__arm_smccc_hvc)
	SMCCC hvc		SMCCC hvc
	ENDPROC(__arm_smccc_hvc)		ENDPROC(__arm_smccc_hvc)
			EXPORT_SYMBOL(__arm_smccc_hvc)