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

Commit abb77f3d authored by Mark Rutland's avatar Mark Rutland Committed by Will Deacon
Browse files

arm64: tishift: 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 tishift 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: default avatarMark Rutland <mark.rutland@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 386b3c7b

arch/arm64/kernel/arm64ksyms.c

+0 −7
Original line number Diff line number Diff line
@@ -68,10 +68,3 @@ NOKPROBE_SYMBOL(_mcount); 
EXPORT_SYMBOL(__arm_smccc_smc);

EXPORT_SYMBOL(__arm_smccc_hvc);

	/* tishift.S */

extern long long __ashlti3(long long a, int b);

EXPORT_SYMBOL(__ashlti3);

extern long long __ashrti3(long long a, int b);

EXPORT_SYMBOL(__ashrti3);

extern long long __lshrti3(long long a, int b);

EXPORT_SYMBOL(__lshrti3);

arch/arm64/lib/tishift.S

+5 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 


#include <linux/linkage.h>



#include <asm/assembler.h>



ENTRY(__ashlti3)

	cbz	x2, 1f

	mov	x3, #64
@@ -25,6 +27,7 @@ ENTRY(__ashlti3) 
	mov	x0, x2

	ret

ENDPROC(__ashlti3)

EXPORT_SYMBOL(__ashlti3)



ENTRY(__ashrti3)

	cbz	x2, 1f
@@ -46,6 +49,7 @@ ENTRY(__ashrti3) 
	mov	x1, x2

	ret

ENDPROC(__ashrti3)

EXPORT_SYMBOL(__ashrti3)



ENTRY(__lshrti3)

	cbz	x2, 1f
@@ -67,3 +71,4 @@ ENTRY(__lshrti3) 
	mov	x1, x2

	ret

ENDPROC(__lshrti3)

EXPORT_SYMBOL(__lshrti3)