| Message ID | 1583894213-7633-1-git-send-email-hayashi.kunihiko@socionext.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 69d113b5c40258aeac15c2eadf6c5dddfbfcf2ae |
| Headers | show |
| Series | arm64: entry-ftrace.S: Fix missing argument for CONFIG_FUNCTION_GRAPH_TRACER=y | expand |
On Wed, Mar 11, 2020 at 11:36:53AM +0900, Kunihiko Hayashi wrote: > Missing argument of another SYM_INNER_LABEL() breaks build for > CONFIG_FUNCTION_GRAPH_TRACER=y. Acked-by: Mark Brown <broonie@kernel.org>
On Wed, Mar 11, 2020 at 11:36:53AM +0900, Kunihiko Hayashi wrote: > Missing argument of another SYM_INNER_LABEL() breaks build for > CONFIG_FUNCTION_GRAPH_TRACER=y. > > Fixes: e2d591d29d44 ("arm64: entry-ftrace.S: Convert to modern annotations for assembly functions") > Cc: Mark Brown <broonie@kernel.org> > Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> Applied. Thanks.
diff --git a/arch/arm64/kernel/entry-ftrace.S b/arch/arm64/kernel/entry-ftrace.S index 8201018..833d48c 100644 --- a/arch/arm64/kernel/entry-ftrace.S +++ b/arch/arm64/kernel/entry-ftrace.S @@ -279,7 +279,7 @@ SYM_INNER_LABEL(ftrace_call, SYM_L_GLOBAL) // tracer(pc, lr); // where xxx can be any kind of tracer. #ifdef CONFIG_FUNCTION_GRAPH_TRACER -SYM_INNER_LABEL(ftrace_graph_call) // ftrace_graph_caller(); +SYM_INNER_LABEL(ftrace_graph_call, SYM_L_GLOBAL) // ftrace_graph_caller(); nop // If enabled, this will be replaced // "b ftrace_graph_caller" #endif
Missing argument of another SYM_INNER_LABEL() breaks build for CONFIG_FUNCTION_GRAPH_TRACER=y. Fixes: e2d591d29d44 ("arm64: entry-ftrace.S: Convert to modern annotations for assembly functions") Cc: Mark Brown <broonie@kernel.org> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> --- arch/arm64/kernel/entry-ftrace.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)