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

1 files changed, 2 insertions, 1 deletions

diff --git a/kernel/trace/trace_functions.c b/kernel/trace/trace_functions.c
index 8693b7a0a5b2..e74f6d0a3216 100644
--- a/kernel/trace/trace_functions.c
+++ b/kernel/trace/trace_functions.c
@@ -42,9 +42,10 @@ static void stop_function_trace(struct trace_array *tr)
         tracing_stop_cmdline_record();
 }
 
-static void function_trace_init(struct trace_array *tr)
+static int function_trace_init(struct trace_array *tr)
 {
         start_function_trace(tr);
+        return 0;
 }
 
 static void function_trace_reset(struct trace_array *tr)