Skip to content

Commit 1242b9b

Browse files
brooniectmarinas
authored andcommitted
arm64: sdei: Annotate SDEI entry points using new style annotations
In an effort to clarify and simplify the annotation of assembly functions new macros have been introduced. These replace ENTRY and ENDPROC with two different annotations for normal functions and those with unusual calling conventions. The SDEI entry points are currently annotated as normal functions but are called from non-kernel contexts with non-standard calling convention and should therefore be annotated as such so do so. Signed-off-by: Mark Brown <[email protected]> Acked-by: James Morse <[email protected]> Signed-off-by: Catalin Marinas <[email protected]>
1 parent 4db61fe commit 1242b9b

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

arch/arm64/kernel/entry.S

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -938,7 +938,7 @@ NOKPROBE(ret_from_fork)
938938
*/
939939
.ltorg
940940
.pushsection ".entry.tramp.text", "ax"
941-
ENTRY(__sdei_asm_entry_trampoline)
941+
SYM_CODE_START(__sdei_asm_entry_trampoline)
942942
mrs x4, ttbr1_el1
943943
tbz x4, #USER_ASID_BIT, 1f
944944

@@ -960,7 +960,7 @@ ENTRY(__sdei_asm_entry_trampoline)
960960
ldr x4, =__sdei_asm_handler
961961
#endif
962962
br x4
963-
ENDPROC(__sdei_asm_entry_trampoline)
963+
SYM_CODE_END(__sdei_asm_entry_trampoline)
964964
NOKPROBE(__sdei_asm_entry_trampoline)
965965

966966
/*
@@ -970,14 +970,14 @@ NOKPROBE(__sdei_asm_entry_trampoline)
970970
* x2: exit_mode
971971
* x4: struct sdei_registered_event argument from registration time.
972972
*/
973-
ENTRY(__sdei_asm_exit_trampoline)
973+
SYM_CODE_START(__sdei_asm_exit_trampoline)
974974
ldr x4, [x4, #(SDEI_EVENT_INTREGS + S_ORIG_ADDR_LIMIT)]
975975
cbnz x4, 1f
976976

977977
tramp_unmap_kernel tmp=x4
978978

979979
1: sdei_handler_exit exit_mode=x2
980-
ENDPROC(__sdei_asm_exit_trampoline)
980+
SYM_CODE_END(__sdei_asm_exit_trampoline)
981981
NOKPROBE(__sdei_asm_exit_trampoline)
982982
.ltorg
983983
.popsection // .entry.tramp.text
@@ -1003,7 +1003,7 @@ SYM_DATA_END(__sdei_asm_trampoline_next_handler)
10031003
* follow SMC-CC. We save (or retrieve) all the registers as the handler may
10041004
* want them.
10051005
*/
1006-
ENTRY(__sdei_asm_handler)
1006+
SYM_CODE_START(__sdei_asm_handler)
10071007
stp x2, x3, [x1, #SDEI_EVENT_INTREGS + S_PC]
10081008
stp x4, x5, [x1, #SDEI_EVENT_INTREGS + 16 * 2]
10091009
stp x6, x7, [x1, #SDEI_EVENT_INTREGS + 16 * 3]
@@ -1086,6 +1086,6 @@ alternative_else_nop_endif
10861086
tramp_alias dst=x5, sym=__sdei_asm_exit_trampoline
10871087
br x5
10881088
#endif
1089-
ENDPROC(__sdei_asm_handler)
1089+
SYM_CODE_END(__sdei_asm_handler)
10901090
NOKPROBE(__sdei_asm_handler)
10911091
#endif /* CONFIG_ARM_SDE_INTERFACE */

0 commit comments

Comments
 (0)