Skip to content

Commit 1e4729e

Browse files
brooniectmarinas
authored andcommitted
arm64: ftrace: Modernise annotation of return_to_handler
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. return_to_handler does entertaining things with LR so doesn't follow the usual C conventions and should therefore be annotated as code rather than a function. Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Catalin Marinas <[email protected]>
1 parent e434b08 commit 1e4729e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/arm64/kernel/entry-ftrace.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ SYM_FUNC_END(ftrace_stub)
320320
* Run ftrace_return_to_handler() before going back to parent.
321321
* @fp is checked against the value passed by ftrace_graph_caller().
322322
*/
323-
ENTRY(return_to_handler)
323+
SYM_CODE_START(return_to_handler)
324324
/* save return value regs */
325325
sub sp, sp, #64
326326
stp x0, x1, [sp]
@@ -340,5 +340,5 @@ ENTRY(return_to_handler)
340340
add sp, sp, #64
341341

342342
ret
343-
END(return_to_handler)
343+
SYM_CODE_END(return_to_handler)
344344
#endif /* CONFIG_FUNCTION_GRAPH_TRACER */

0 commit comments

Comments
 (0)