arm64/Kconfig: Remove redundant 'if HAVE_FUNCTION_GRAPH_TRACER'

[PATCH] arm64/Kconfig: Remove redundant 'if HAVE_FUNCTION_GRAPH_TRACER'

Posted by Anshuman Khandual 1 year, 5 months ago

Since the commit 819e50e25d0c ("arm64: Add ftrace support"),
HAVE_FUNCTION_GRAPH_TRACER has always been enabled. Although a subsequent
commit 364697032246 ("arm64: ftrace: Enable HAVE_FUNCTION_GRAPH_RETVAL")
redundantly added check on HAVE_FUNCTION_GRAPH_TRACER, while enabling the
config HAVE_FUNCTION_GRAPH_RETVAL. Let's just drop this redundant check.

Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org
CC: linux-kernel@vger.kernel.org
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
---
 arch/arm64/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 79a656a62cbc..cf1781cdc062 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -211,8 +211,8 @@ config ARM64
 	select HAVE_FTRACE_MCOUNT_RECORD
 	select HAVE_FUNCTION_TRACER
 	select HAVE_FUNCTION_ERROR_INJECTION
-	select HAVE_FUNCTION_GRAPH_RETVAL if HAVE_FUNCTION_GRAPH_TRACER
 	select HAVE_FUNCTION_GRAPH_TRACER
+	select HAVE_FUNCTION_GRAPH_RETVAL
 	select HAVE_GCC_PLUGINS
 	select HAVE_HARDLOCKUP_DETECTOR_PERF if PERF_EVENTS && \
 		HW_PERF_EVENTS && HAVE_PERF_EVENTS_NMI
-- 
2.30.2

Re: [PATCH] arm64/Kconfig: Remove redundant 'if HAVE_FUNCTION_GRAPH_TRACER'

Posted by Will Deacon 1 year, 4 months ago

On Tue, 16 Jul 2024 10:39:15 +0530, Anshuman Khandual wrote:
> Since the commit 819e50e25d0c ("arm64: Add ftrace support"),
> HAVE_FUNCTION_GRAPH_TRACER has always been enabled. Although a subsequent
> commit 364697032246 ("arm64: ftrace: Enable HAVE_FUNCTION_GRAPH_RETVAL")
> redundantly added check on HAVE_FUNCTION_GRAPH_TRACER, while enabling the
> config HAVE_FUNCTION_GRAPH_RETVAL. Let's just drop this redundant check.
> 
> 
> [...]

Applied to arm64 (for-next/core), thanks!

[1/1] arm64/Kconfig: Remove redundant 'if HAVE_FUNCTION_GRAPH_TRACER'
      https://git.kernel.org/arm64/c/add6128fc7f0

Cheers,
-- 
Will

https://fixes.arm64.dev
https://next.arm64.dev
https://will.arm64.dev

Re: [PATCH] arm64/Kconfig: Remove redundant 'if HAVE_FUNCTION_GRAPH_TRACER'

Posted by Mark Rutland 1 year, 5 months ago

On Tue, Jul 16, 2024 at 10:39:15AM +0530, Anshuman Khandual wrote:
> Since the commit 819e50e25d0c ("arm64: Add ftrace support"),
> HAVE_FUNCTION_GRAPH_TRACER has always been enabled. Although a subsequent
> commit 364697032246 ("arm64: ftrace: Enable HAVE_FUNCTION_GRAPH_RETVAL")
> redundantly added check on HAVE_FUNCTION_GRAPH_TRACER, while enabling the
> config HAVE_FUNCTION_GRAPH_RETVAL. Let's just drop this redundant check.
> 
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Cc: Will Deacon <will@kernel.org>
> Cc: linux-arm-kernel@lists.infradead.org
> CC: linux-kernel@vger.kernel.org
> Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>

Acked-by: Mark Rutland <mark.rutland@arm.com>

Mark.

> ---
>  arch/arm64/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
> index 79a656a62cbc..cf1781cdc062 100644
> --- a/arch/arm64/Kconfig
> +++ b/arch/arm64/Kconfig
> @@ -211,8 +211,8 @@ config ARM64
>  	select HAVE_FTRACE_MCOUNT_RECORD
>  	select HAVE_FUNCTION_TRACER
>  	select HAVE_FUNCTION_ERROR_INJECTION
> -	select HAVE_FUNCTION_GRAPH_RETVAL if HAVE_FUNCTION_GRAPH_TRACER
>  	select HAVE_FUNCTION_GRAPH_TRACER
> +	select HAVE_FUNCTION_GRAPH_RETVAL
>  	select HAVE_GCC_PLUGINS
>  	select HAVE_HARDLOCKUP_DETECTOR_PERF if PERF_EVENTS && \
>  		HW_PERF_EVENTS && HAVE_PERF_EVENTS_NMI
> -- 
> 2.30.2
>