1 files changed, 5 insertions, 4 deletions

diff --git a/arch/s390/kernel/ftrace.c b/arch/s390/kernel/ftrace.c
index 39b13d71a8fe..1bb85f60c0dd 100644
--- a/arch/s390/kernel/ftrace.c
+++ b/arch/s390/kernel/ftrace.c
@@ -201,17 +201,18 @@ device_initcall(ftrace_plt_init);
  * Hook the return address and push it in the stack of return addresses
  * in current thread info.
  */
-unsigned long prepare_ftrace_return(unsigned long parent, unsigned long ip)
+unsigned long prepare_ftrace_return(unsigned long ra, unsigned long sp,
+                                    unsigned long ip)
 {
         if (unlikely(ftrace_graph_is_dead()))
                 goto out;
         if (unlikely(atomic_read(&current->tracing_graph_pause)))
                 goto out;
         ip -= MCOUNT_INSN_SIZE;
-        if (!function_graph_enter(parent, ip, 0, NULL))
-                parent = (unsigned long) return_to_handler;
+        if (!function_graph_enter(ra, ip, 0, (void *) sp))
+                ra = (unsigned long) return_to_handler;
 out:
-        return parent;
+        return ra;
 }
 NOKPROBE_SYMBOL(prepare_ftrace_return);