Commit 68a63a41 authored by James Clark's avatar James Clark Committed by Will Deacon
Browse files

arm64: Fix build with CC=clang, CONFIG_FTRACE=y and CONFIG_STACK_TRACER=y 



commit 45bd8951 ("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 26299b3f ("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: 26299b3f ("ftrace: arm64: move from REGS to ARGS")
Signed-off-by: default avatarJames Clark <james.clark@arm.com>
Link: https://lore.kernel.org/r/20230109122744.1904852-1-james.clark@arm.com


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 4e4ff23a

arch/arm64/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -184,8 +184,6 @@ config ARM64 
	select HAVE_DEBUG_KMEMLEAK

	select HAVE_DMA_CONTIGUOUS

	select HAVE_DYNAMIC_FTRACE

	select HAVE_DYNAMIC_FTRACE_WITH_ARGS \

		if $(cc-option,-fpatchable-function-entry=2)

	select FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY \

		if DYNAMIC_FTRACE_WITH_ARGS

	select HAVE_EFFICIENT_UNALIGNED_ACCESS