Skip to content

Commit e7bf697

Browse files
brooniectmarinas
authored andcommitted
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: Mark Brown <[email protected]> Signed-off-by: Catalin Marinas <[email protected]>
1 parent c3357fc commit e7bf697

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

arch/arm64/kernel/entry.S

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -832,7 +832,7 @@ alternative_else_nop_endif
832832
.endm
833833

834834
.align 11
835-
ENTRY(tramp_vectors)
835+
SYM_CODE_START_NOALIGN(tramp_vectors)
836836
.space 0x400
837837

838838
tramp_ventry
@@ -844,15 +844,15 @@ ENTRY(tramp_vectors)
844844
tramp_ventry 32
845845
tramp_ventry 32
846846
tramp_ventry 32
847-
END(tramp_vectors)
847+
SYM_CODE_END(tramp_vectors)
848848

849-
ENTRY(tramp_exit_native)
849+
SYM_CODE_START(tramp_exit_native)
850850
tramp_exit
851-
END(tramp_exit_native)
851+
SYM_CODE_END(tramp_exit_native)
852852

853-
ENTRY(tramp_exit_compat)
853+
SYM_CODE_START(tramp_exit_compat)
854854
tramp_exit 32
855-
END(tramp_exit_compat)
855+
SYM_CODE_END(tramp_exit_compat)
856856

857857
.ltorg
858858
.popsection // .entry.tramp.text
@@ -874,7 +874,7 @@ __entry_tramp_data_start:
874874
* Previous and next are guaranteed not to be the same.
875875
*
876876
*/
877-
ENTRY(cpu_switch_to)
877+
SYM_FUNC_START(cpu_switch_to)
878878
mov x10, #THREAD_CPU_CONTEXT
879879
add x8, x0, x10
880880
mov x9, sp
@@ -896,7 +896,7 @@ ENTRY(cpu_switch_to)
896896
mov sp, x9
897897
msr sp_el0, x1
898898
ret
899-
ENDPROC(cpu_switch_to)
899+
SYM_FUNC_END(cpu_switch_to)
900900
NOKPROBE(cpu_switch_to)
901901

902902
/*

0 commit comments

Comments
 (0)