[PATCH 05/17] powerpc/ftrace: Use FTRACE_REGS_ADDR to identify the correct ftrace trampoline

[Christophe Leroy]

Le 19/06/2023 à 11:47, Naveen N Rao a écrit :
> Instead of keying off DYNAMIC_FTRACE_WITH_REGS, use FTRACE_REGS_ADDR to
> identify the proper ftrace trampoline address to use.
> 
> Signed-off-by: Naveen N Rao <naveen at kernel.org>

Reviewed-by: Christophe Leroy <christophe.leroy at csgroup.eu>

> ---
>   arch/powerpc/kernel/trace/ftrace.c | 7 +------
>   1 file changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/arch/powerpc/kernel/trace/ftrace.c b/arch/powerpc/kernel/trace/ftrace.c
> index f117124c30325f..5aa36272617a03 100644
> --- a/arch/powerpc/kernel/trace/ftrace.c
> +++ b/arch/powerpc/kernel/trace/ftrace.c
> @@ -745,14 +745,9 @@ int __init ftrace_dyn_arch_init(void)
>   	};
>   #endif
>   
> -	unsigned long addr;
> +	unsigned long addr = FTRACE_REGS_ADDR;
>   	long reladdr;
>   
> -	if (IS_ENABLED(CONFIG_DYNAMIC_FTRACE_WITH_REGS))
> -		addr = ppc_global_function_entry((void *)ftrace_regs_caller);
> -	else
> -		addr = ppc_global_function_entry((void *)ftrace_caller);
> -
>   	if (IS_ENABLED(CONFIG_PPC_KERNEL_PCREL)) {
>   		for (i = 0; i < 2; i++) {
>   			reladdr = addr - (unsigned long)tramp[i];