summaryrefslogtreecommitdiffstats
path: root/arch/arm64/kernel/cpu-reset.S
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2020-05-01 12:54:29 +0100
committerWill Deacon <will@kernel.org>2020-05-04 12:46:03 +0100
commit0343a7e46362c3836ff27ceb749ee2b6f78aa982 (patch)
treeba3fd870e6ae195a8dea40cd91cf52b5ad333d48 /arch/arm64/kernel/cpu-reset.S
parent06607c7e93f2a4799346baa262d4304681e4b528 (diff)
downloadlinux-0343a7e46362c3836ff27ceb749ee2b6f78aa982.tar.bz2
arm64: kernel: Convert to 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 core kernel code to the new macros. Signed-off-by: Mark Brown <broonie@kernel.org> Acked-by: Mark Rutland <mark.rutland@arm.com> Link: https://lore.kernel.org/r/20200501115430.37315-3-broonie@kernel.org Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'arch/arm64/kernel/cpu-reset.S')
-rw-r--r--arch/arm64/kernel/cpu-reset.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/kernel/cpu-reset.S b/arch/arm64/kernel/cpu-reset.S
index 38087b4c0432..4a18055b2ff9 100644
--- a/arch/arm64/kernel/cpu-reset.S
+++ b/arch/arm64/kernel/cpu-reset.S
@@ -29,7 +29,7 @@
* branch to what would be the reset vector. It must be executed with the
* flat identity mapping.
*/
-ENTRY(__cpu_soft_restart)
+SYM_CODE_START(__cpu_soft_restart)
/* Clear sctlr_el1 flags. */
mrs x12, sctlr_el1
mov_q x13, SCTLR_ELx_FLAGS
@@ -47,6 +47,6 @@ ENTRY(__cpu_soft_restart)
mov x1, x3 // arg1
mov x2, x4 // arg2
br x8
-ENDPROC(__cpu_soft_restart)
+SYM_CODE_END(__cpu_soft_restart)
.popsection