Skip to content

Commit 931a2ca

Browse files
arndbrostedt
authored andcommitted
arm64: ftrace: fix build error with CONFIG_FUNCTION_GRAPH_TRACER=n
It appears that a merge conflict ended up hiding a newly added constant in some configurations: arch/arm64/kernel/entry-ftrace.S: Assembler messages: arch/arm64/kernel/entry-ftrace.S:59: Error: undefined symbol FTRACE_OPS_DIRECT_CALL used as an immediate value FTRACE_OPS_DIRECT_CALL is still used when CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS is enabled, even if CONFIG_FUNCTION_GRAPH_TRACER is disabled, so change the ifdef accordingly. Link: https://lkml.kernel.org/r/[email protected] Cc: Will Deacon <[email protected]> Cc: Mark Rutland <[email protected]> Cc: Donglin Peng <[email protected]> Fixes: 3646970 ("arm64: ftrace: Enable HAVE_FUNCTION_GRAPH_RETVAL") Signed-off-by: Arnd Bergmann <[email protected]> Acked-by: Florent Revest <[email protected]> Reviewed-by: Randy Dunlap <[email protected]> Tested-by: Randy Dunlap <[email protected]> # build-tested Acked-by: Catalin Marinas <[email protected]> Signed-off-by: Steven Rostedt (Google) <[email protected]>
1 parent 02b0095 commit 931a2ca

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/arm64/kernel/asm-offsets.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,9 +213,9 @@ int main(void)
213213
DEFINE(FGRET_REGS_X7, offsetof(struct fgraph_ret_regs, regs[7]));
214214
DEFINE(FGRET_REGS_FP, offsetof(struct fgraph_ret_regs, fp));
215215
DEFINE(FGRET_REGS_SIZE, sizeof(struct fgraph_ret_regs));
216+
#endif
216217
#ifdef CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS
217218
DEFINE(FTRACE_OPS_DIRECT_CALL, offsetof(struct ftrace_ops, direct_call));
218-
#endif
219219
#endif
220220
return 0;
221221
}

0 commit comments

Comments
 (0)