From: Christoph Hellwig <hch@xxxxxx> [ Upstream commit 877425424d6c853b804e6b6a6045a5b4ea97c510 ] HAVE_FUNCTION_GRAPH_RET_ADDR_PTR is always defined for RISC-V. Signed-off-by: Christoph Hellwig <hch@xxxxxx> Signed-off-by: Palmer Dabbelt <palmer@xxxxxxxxxx> Stable-dep-of: 5c3022e4a616 ("riscv: stacktrace: Fixup ftrace_graph_ret_addr retp argument") Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx> --- arch/riscv/kernel/stacktrace.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/riscv/kernel/stacktrace.c b/arch/riscv/kernel/stacktrace.c index 74b2168d7298..39cd3cf9f06b 100644 --- a/arch/riscv/kernel/stacktrace.c +++ b/arch/riscv/kernel/stacktrace.c @@ -64,12 +64,8 @@ static void notrace walk_stackframe(struct task_struct *task, frame = (struct stackframe *)fp - 1; sp = fp; fp = frame->fp; -#ifdef HAVE_FUNCTION_GRAPH_RET_ADDR_PTR pc = ftrace_graph_ret_addr(current, NULL, frame->ra, (unsigned long *)(fp - 8)); -#else - pc = frame->ra - 0x4; -#endif } } -- 2.35.1