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

Commit d9458990 authored by Mark Brown's avatar Mark Brown Committed by Greg Kroah-Hartman
Browse files

arm64: lib: Use modern annotations for assembly functions 



commit 3ac0f4526dfb80625f5c2365bccd85be68db93ef upstream.

In an effort to clarify and simplify the annotation of assembly functions
in the kernel new macros have been introduced. These replace ENTRY and
ENDPROC and also add a new annotation for static functions which previously
had no ENTRY equivalent. Update the annotations in the library code to the
new macros.

Signed-off-by: default avatarMark Brown <broonie@kernel.org>
[will: Use SYM_FUNC_START_WEAK_PI]
Signed-off-by: default avatarWill Deacon <will@kernel.org>
Cc: Jian Cai <jiancai@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3e705066

arch/arm64/lib/clear_page.S

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * Parameters:

 *	x0 - dest

 */

ENTRY(clear_page)

SYM_FUNC_START(clear_page)

	mrs	x1, dczid_el0

	and	w1, w1, #0xf

	mov	x2, #4
@@ -25,5 +25,5 @@ ENTRY(clear_page) 
	tst	x0, #(PAGE_SIZE - 1)

	b.ne	1b

	ret

ENDPROC(clear_page)

SYM_FUNC_END(clear_page)

EXPORT_SYMBOL(clear_page)

arch/arm64/lib/clear_user.S

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
 *

 * Alignment fixed up by hardware.

 */

ENTRY(__arch_clear_user)

SYM_FUNC_START(__arch_clear_user)

	mov	x2, x1			// save the size for fixup return

	subs	x1, x1, #8

	b.mi	2f
@@ -40,7 +40,7 @@ uao_user_alternative 9f, strh, sttrh, wzr, x0, 2 
uao_user_alternative 9f, strb, sttrb, wzr, x0, 0

5:	mov	x0, #0

	ret

ENDPROC(__arch_clear_user)

SYM_FUNC_END(__arch_clear_user)

EXPORT_SYMBOL(__arch_clear_user)



	.section .fixup,"ax"

arch/arm64/lib/copy_from_user.S

+2 −2
Original line number Diff line number Diff line
@@ -53,12 +53,12 @@ 
	.endm



end	.req	x5

ENTRY(__arch_copy_from_user)

SYM_FUNC_START(__arch_copy_from_user)

	add	end, x0, x2

#include "copy_template.S"

	mov	x0, #0				// Nothing to copy

	ret

ENDPROC(__arch_copy_from_user)

SYM_FUNC_END(__arch_copy_from_user)

EXPORT_SYMBOL(__arch_copy_from_user)



	.section .fixup,"ax"

arch/arm64/lib/copy_in_user.S

+2 −2
Original line number Diff line number Diff line
@@ -55,12 +55,12 @@ 


end	.req	x5



ENTRY(__arch_copy_in_user)

SYM_FUNC_START(__arch_copy_in_user)

	add	end, x0, x2

#include "copy_template.S"

	mov	x0, #0

	ret

ENDPROC(__arch_copy_in_user)

SYM_FUNC_END(__arch_copy_in_user)

EXPORT_SYMBOL(__arch_copy_in_user)



	.section .fixup,"ax"

arch/arm64/lib/copy_page.S

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
 *	x0 - dest

 *	x1 - src

 */

ENTRY(copy_page)

SYM_FUNC_START(copy_page)

alternative_if ARM64_HAS_NO_HW_PREFETCH

	// Prefetch three cache lines ahead.

	prfm	pldl1strm, [x1, #128]
@@ -75,5 +75,5 @@ alternative_else_nop_endif 
	stnp	x16, x17, [x0, #112]



	ret

ENDPROC(copy_page)

SYM_FUNC_END(copy_page)

EXPORT_SYMBOL(copy_page)