Commit e7bf6972 authored by Mark Brown's avatar Mark Brown Committed by Catalin Marinas

arm64: entry: Additional annotation conversions for entry.S

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 with separate annotations for standard C callable functions,
data and code with different calling conventions.  Update the
remaining annotations in the entry.S code to the new macros.
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent c3357fc5
...@@ -832,7 +832,7 @@ alternative_else_nop_endif ...@@ -832,7 +832,7 @@ alternative_else_nop_endif
.endm .endm
.align 11 .align 11
ENTRY(tramp_vectors) SYM_CODE_START_NOALIGN(tramp_vectors)
.space 0x400 .space 0x400
tramp_ventry tramp_ventry
...@@ -844,15 +844,15 @@ ENTRY(tramp_vectors) ...@@ -844,15 +844,15 @@ ENTRY(tramp_vectors)
tramp_ventry 32 tramp_ventry 32
tramp_ventry 32 tramp_ventry 32
tramp_ventry 32 tramp_ventry 32
END(tramp_vectors) SYM_CODE_END(tramp_vectors)
ENTRY(tramp_exit_native) SYM_CODE_START(tramp_exit_native)
tramp_exit tramp_exit
END(tramp_exit_native) SYM_CODE_END(tramp_exit_native)
ENTRY(tramp_exit_compat) SYM_CODE_START(tramp_exit_compat)
tramp_exit 32 tramp_exit 32
END(tramp_exit_compat) SYM_CODE_END(tramp_exit_compat)
.ltorg .ltorg
.popsection // .entry.tramp.text .popsection // .entry.tramp.text
...@@ -874,7 +874,7 @@ __entry_tramp_data_start: ...@@ -874,7 +874,7 @@ __entry_tramp_data_start:
* Previous and next are guaranteed not to be the same. * Previous and next are guaranteed not to be the same.
* *
*/ */
ENTRY(cpu_switch_to) SYM_FUNC_START(cpu_switch_to)
mov x10, #THREAD_CPU_CONTEXT mov x10, #THREAD_CPU_CONTEXT
add x8, x0, x10 add x8, x0, x10
mov x9, sp mov x9, sp
...@@ -896,7 +896,7 @@ ENTRY(cpu_switch_to) ...@@ -896,7 +896,7 @@ ENTRY(cpu_switch_to)
mov sp, x9 mov sp, x9
msr sp_el0, x1 msr sp_el0, x1
ret ret
ENDPROC(cpu_switch_to) SYM_FUNC_END(cpu_switch_to)
NOKPROBE(cpu_switch_to) NOKPROBE(cpu_switch_to)
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment