Skip to content

Commit 68a63a4

Browse files
James-A-Clarkwilldeacon
authored andcommitted
arm64: Fix build with CC=clang, CONFIG_FTRACE=y and CONFIG_STACK_TRACER=y
commit 45bd895 ("arm64: Improve HAVE_DYNAMIC_FTRACE_WITH_REGS selection for clang") fixed the build with the above combination by splitting HAVE_DYNAMIC_FTRACE_WITH_REGS into separate checks for Clang and GCC. commit 26299b3 ("ftrace: arm64: move from REGS to ARGS") added the GCC only check "-fpatchable-function-entry=2" back in unconditionally which breaks the build. Remove the unconditional check, because the conditional ones were also updated to _ARGS in the above commit, so they work correctly on their own. Fixes: 26299b3 ("ftrace: arm64: move from REGS to ARGS") Signed-off-by: James Clark <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Will Deacon <[email protected]>
1 parent 4e4ff23 commit 68a63a4

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

arch/arm64/Kconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,6 @@ config ARM64
184184
select HAVE_DEBUG_KMEMLEAK
185185
select HAVE_DMA_CONTIGUOUS
186186
select HAVE_DYNAMIC_FTRACE
187-
select HAVE_DYNAMIC_FTRACE_WITH_ARGS \
188-
if $(cc-option,-fpatchable-function-entry=2)
189187
select FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY \
190188
if DYNAMIC_FTRACE_WITH_ARGS
191189
select HAVE_EFFICIENT_UNALIGNED_ACCESS

0 commit comments

Comments
 (0)