arm64: ftrace: fix build error with CONFIG_FUNCTION_GRAPH_TRACER=n
authorArnd Bergmann <arnd@arndb.de>
Fri, 23 Jun 2023 15:21:55 +0000 (17:21 +0200)
committerSteven Rostedt (Google) <rostedt@goodmis.org>
Wed, 5 Jul 2023 13:46:19 +0000 (09:46 -0400)
commit931a2ca6a5ba4bfa6062aa9475d4e6a835d75e83
tree8a34d4530e71a4f823d1b773b5996d577f25302a
parent02b0095e2fbbc060560c1065f86a211d91e27b26
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/20230623152204.2216297-1-arnd@kernel.org
Cc: Will Deacon <will@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Donglin Peng <pengdonglin@sangfor.com.cn>
Fixes: 3646970322464 ("arm64: ftrace: Enable HAVE_FUNCTION_GRAPH_RETVAL")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Florent Revest <revest@chromium.org>
Reviewed-by: Randy Dunlap <rdunlap@infradead.org>
Tested-by: Randy Dunlap <rdunlap@infradead.org> # build-tested
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
arch/arm64/kernel/asm-offsets.c