Merge branch 'tracing/function-return-tracer' into tracing/fastboot

1 files changed, 16 insertions, 0 deletions

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 25b803559f17..beb21a51e1ef 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -1480,3 +1480,19 @@ ftrace_enable_sysctl(struct ctl_table *table, int write,
         return ret;
 }
 
+#ifdef CONFIG_FUNCTION_RET_TRACER
+trace_function_return_t ftrace_function_return =
+                        (trace_function_return_t)ftrace_stub;
+void register_ftrace_return(trace_function_return_t func)
+{
+        ftrace_function_return = func;
+}
+
+void unregister_ftrace_return(void)
+{
+        ftrace_function_return = (trace_function_return_t)ftrace_stub;
+}
+#endif
+
+
+