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

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

arm64: uaccess: 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 uaccess exports
to the assembly files the functions are defined in.  As we have to
include <asm/assembler.h>, the existing includes are fixed to follow the
usual ordering conventions.

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 50fdecb2

arch/arm64/kernel/arm64ksyms.c

+0 −7
Original line number Diff line number Diff line
@@ -24,18 +24,11 @@ 
#include <linux/delay.h>

#include <linux/in6.h>

#include <linux/syscalls.h>

#include <linux/uaccess.h>

#include <linux/io.h>

#include <linux/kprobes.h>



#include <asm/checksum.h>



	/* user mem (segment) */

EXPORT_SYMBOL(__arch_copy_from_user);

EXPORT_SYMBOL(__arch_copy_to_user);

EXPORT_SYMBOL(__arch_clear_user);

EXPORT_SYMBOL(__arch_copy_in_user);



	/* string / mem functions */

#ifndef CONFIG_KASAN

EXPORT_SYMBOL(strchr);

arch/arm64/lib/clear_user.S

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/linkage.h>



#include <asm/asm-uaccess.h>

#include <asm/assembler.h>



	.text
@@ -53,6 +54,7 @@ uao_user_alternative 9f, strb, sttrb, wzr, x0, 0 
	uaccess_disable_not_uao x2, x3

	ret

ENDPROC(__arch_clear_user)

EXPORT_SYMBOL(__arch_clear_user)



	.section .fixup,"ax"

	.align	2

arch/arm64/lib/copy_from_user.S

+3 −1
Original line number Diff line number Diff line
@@ -16,8 +16,9 @@ 


#include <linux/linkage.h>



#include <asm/cache.h>

#include <asm/asm-uaccess.h>

#include <asm/assembler.h>

#include <asm/cache.h>



/*

 * Copy from user space to a kernel buffer (alignment handled by the hardware)
@@ -71,6 +72,7 @@ ENTRY(__arch_copy_from_user) 
	mov	x0, #0				// Nothing to copy

	ret

ENDPROC(__arch_copy_from_user)

EXPORT_SYMBOL(__arch_copy_from_user)



	.section .fixup,"ax"

	.align	2

arch/arm64/lib/copy_in_user.S

+3 −1
Original line number Diff line number Diff line
@@ -18,8 +18,9 @@ 


#include <linux/linkage.h>



#include <asm/cache.h>

#include <asm/asm-uaccess.h>

#include <asm/assembler.h>

#include <asm/cache.h>



/*

 * Copy from user space to user space (alignment handled by the hardware)
@@ -73,6 +74,7 @@ ENTRY(__arch_copy_in_user) 
	mov	x0, #0

	ret

ENDPROC(__arch_copy_in_user)

EXPORT_SYMBOL(__arch_copy_in_user)



	.section .fixup,"ax"

	.align	2

arch/arm64/lib/copy_to_user.S

+3 −1
Original line number Diff line number Diff line
@@ -16,8 +16,9 @@ 


#include <linux/linkage.h>



#include <asm/cache.h>

#include <asm/asm-uaccess.h>

#include <asm/assembler.h>

#include <asm/cache.h>



/*

 * Copy to user space from a kernel buffer (alignment handled by the hardware)
@@ -70,6 +71,7 @@ ENTRY(__arch_copy_to_user) 
	mov	x0, #0

	ret

ENDPROC(__arch_copy_to_user)

EXPORT_SYMBOL(__arch_copy_to_user)



	.section .fixup,"ax"

	.align	2