Skip to content

Commit

Permalink
powerpc/ftrace: Use FTRACE_REGS_ADDR to identify the correct ftrace t…
Browse files Browse the repository at this point in the history
…rampoline

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@kernel.org>
Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/6045a280a57a7ea937a5bb13ccac747026dbfb07.1687166935.git.naveen@kernel.org
  • Loading branch information
rnav authored and mpe committed Aug 21, 2023
1 parent 96d7a13 commit b5efb61
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions arch/powerpc/kernel/trace/ftrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down

0 comments on commit b5efb61

Please sign in to comment.