summaryrefslogtreecommitdiffstats
path: root/arch/arm64/kernel/relocate_kernel.S
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2020-05-01 13:54:29 +0200
committerWill Deacon <will@kernel.org>2020-05-04 13:46:03 +0200
commit0343a7e46362c3836ff27ceb749ee2b6f78aa982 (patch)
treeba3fd870e6ae195a8dea40cd91cf52b5ad333d48 /arch/arm64/kernel/relocate_kernel.S
parentarm64: entry: Refactor and modernise annotation for ret_to_user (diff)
downloadlinux-0343a7e46362c3836ff27ceb749ee2b6f78aa982.tar.xz
linux-0343a7e46362c3836ff27ceb749ee2b6f78aa982.zip
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/relocate_kernel.S')
-rw-r--r--arch/arm64/kernel/relocate_kernel.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/kernel/relocate_kernel.S b/arch/arm64/kernel/relocate_kernel.S
index c40ce496c78b..542d6edc6806 100644
--- a/arch/arm64/kernel/relocate_kernel.S
+++ b/arch/arm64/kernel/relocate_kernel.S
@@ -26,7 +26,7 @@
* control_code_page, a special page which has been set up to be preserved
* during the copy operation.
*/
-ENTRY(arm64_relocate_new_kernel)
+SYM_CODE_START(arm64_relocate_new_kernel)
/* Setup the list loop variables. */
mov x18, x2 /* x18 = dtb address */
@@ -111,7 +111,7 @@ ENTRY(arm64_relocate_new_kernel)
mov x3, xzr
br x17
-ENDPROC(arm64_relocate_new_kernel)
+SYM_CODE_END(arm64_relocate_new_kernel)
.align 3 /* To keep the 64-bit values below naturally aligned. */