summaryrefslogtreecommitdiffstats
path: root/arch/arm64/lib/memset.S
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2020-01-06 19:58:17 +0000
committerWill Deacon <will@kernel.org>2020-01-08 12:23:02 +0000
commit3ac0f4526dfb80625f5c2365bccd85be68db93ef (patch)
tree58c39c4356929979b57fad4970f1e65838769c65 /arch/arm64/lib/memset.S
parent35e61c77ef386555f3df1bc2057098c6997ca10b (diff)
downloadlinux-3ac0f4526dfb80625f5c2365bccd85be68db93ef.tar.bz2
arm64: lib: Use modern annotations for assembly functions
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: Mark Brown <broonie@kernel.org> [will: Use SYM_FUNC_START_WEAK_PI] Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'arch/arm64/lib/memset.S')
-rw-r--r--arch/arm64/lib/memset.S8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm64/lib/memset.S b/arch/arm64/lib/memset.S
index 9fb97e6bc560..77c3c7ba0084 100644
--- a/arch/arm64/lib/memset.S
+++ b/arch/arm64/lib/memset.S
@@ -43,8 +43,8 @@ tmp3w .req w9
tmp3 .req x9
.weak memset
-ENTRY(__memset)
-ENTRY(memset)
+SYM_FUNC_START_ALIAS(__memset)
+SYM_FUNC_START_PI(memset)
mov dst, dstin /* Preserve return value. */
and A_lw, val, #255
orr A_lw, A_lw, A_lw, lsl #8
@@ -203,7 +203,7 @@ ENTRY(memset)
ands count, count, zva_bits_x
b.ne .Ltail_maybe_long
ret
-ENDPIPROC(memset)
+SYM_FUNC_END_PI(memset)
EXPORT_SYMBOL(memset)
-ENDPROC(__memset)
+SYM_FUNC_END_ALIAS(__memset)
EXPORT_SYMBOL(__memset)