This is a note to let you know that I've just added the patch titled riscv: remove unreachable !HAVE_FUNCTION_GRAPH_RET_ADDR_PTR code to the 4.19-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: riscv-remove-unreachable-have_function_graph_ret_add.patch and it can be found in the queue-4.19 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. commit 8bc6d6af4c47438cd8ac86927f6072797bed3786 Author: Christoph Hellwig <hch@xxxxxx> Date: Mon Apr 15 11:14:39 2019 +0200 riscv: remove unreachable !HAVE_FUNCTION_GRAPH_RET_ADDR_PTR code [ 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> 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 } }