Skip to content

Commit ebdf44a

Browse files
brooniectmarinas
authored andcommitted
arm64: head: Annotate stext and preserve_boot_args as code
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. Neither stext nor preserve_boot_args is called with the usual AAPCS calling conventions and they should therefore be annotated as code. Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Catalin Marinas <[email protected]>
1 parent c63d9f8 commit ebdf44a

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

arch/arm64/kernel/head.S

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ pe_header:
105105
* x24 __primary_switch() .. relocate_kernel()
106106
* current RELR displacement
107107
*/
108-
ENTRY(stext)
108+
SYM_CODE_START(stext)
109109
bl preserve_boot_args
110110
bl el2_setup // Drop to EL1, w0=cpu_boot_mode
111111
adrp x23, __PHYS_OFFSET
@@ -120,12 +120,12 @@ ENTRY(stext)
120120
*/
121121
bl __cpu_setup // initialise processor
122122
b __primary_switch
123-
ENDPROC(stext)
123+
SYM_CODE_END(stext)
124124

125125
/*
126126
* Preserve the arguments passed by the bootloader in x0 .. x3
127127
*/
128-
preserve_boot_args:
128+
SYM_CODE_START_LOCAL(preserve_boot_args)
129129
mov x21, x0 // x21=FDT
130130

131131
adr_l x0, boot_args // record the contents of
@@ -137,7 +137,7 @@ preserve_boot_args:
137137

138138
mov x1, #0x20 // 4 x 8 bytes
139139
b __inval_dcache_area // tail call
140-
ENDPROC(preserve_boot_args)
140+
SYM_CODE_END(preserve_boot_args)
141141

142142
/*
143143
* Macro to create a table entry to the next page.

0 commit comments

Comments
 (0)