summaryrefslogtreecommitdiffstats
path: root/arch/riscv
diff options
context:
space:
mode:
authorZong Li <zong.li@sifive.com>2019-12-23 16:46:13 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-01-09 10:19:02 +0100
commitac8e28a9b2ffa4667bfe1b1d2712d0bb8954bee8 (patch)
treed47b9b900c848784729a78dcd353bc60a995d57d /arch/riscv
parent316a9a84dbaf628b74d30fd3e1a5dac739e125ed (diff)
downloadlinux-stable-ac8e28a9b2ffa4667bfe1b1d2712d0bb8954bee8.tar.gz
linux-stable-ac8e28a9b2ffa4667bfe1b1d2712d0bb8954bee8.tar.bz2
linux-stable-ac8e28a9b2ffa4667bfe1b1d2712d0bb8954bee8.zip
riscv: ftrace: correct the condition logic in function graph tracer
commit 1d8f65798240b6577d8c44d20c8ea8f1d429e495 upstream. The condition should be logical NOT to assign the hook address to parent address. Because the return value 0 of function_graph_enter upon success. Fixes: e949b6db51dc (riscv/function_graph: Simplify with function_graph_enter()) Signed-off-by: Zong Li <zong.li@sifive.com> Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org> Cc: stable@vger.kernel.org Signed-off-by: Paul Walmsley <paul.walmsley@sifive.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/riscv')
-rw-r--r--arch/riscv/kernel/ftrace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/riscv/kernel/ftrace.c b/arch/riscv/kernel/ftrace.c
index a840b7d074f7..6d39f64e4dce 100644
--- a/arch/riscv/kernel/ftrace.c
+++ b/arch/riscv/kernel/ftrace.c
@@ -142,7 +142,7 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr,
*/
old = *parent;
- if (function_graph_enter(old, self_addr, frame_pointer, parent))
+ if (!function_graph_enter(old, self_addr, frame_pointer, parent))
*parent = return_hooker;
}