Merge branch 'for-5.1/libnvdimm' into libnvdimm-for-next

[linux.git] / kernel / trace / trace_selftest.c

diff --git a/kernel/trace/trace_selftest.c b/kernel/trace/trace_selftest.c
index 11e9daa4a568a22c38669269a89769b0b3bae9f3..9d402e7fc949cb7b8dfee9975f17be8508446810 100644 (file)
--- a/kernel/trace/trace_selftest.c
+++ b/kernel/trace/trace_selftest.c
@@ -741,6 +741,11 @@ static int trace_graph_entry_watchdog(struct ftrace_graph_ent *trace)
        return trace_graph_entry(trace);
 }
 
+static struct fgraph_ops fgraph_ops __initdata  = {
+       .entryfunc              = &trace_graph_entry_watchdog,
+       .retfunc                = &trace_graph_return,
+};
+
 /*
  * Pretty much the same than for the function tracer from which the selftest
  * has been borrowed.
@@ -765,8 +770,7 @@ trace_selftest_startup_function_graph(struct tracer *trace,
         */
        tracing_reset_online_cpus(&tr->trace_buffer);
        set_graph_array(tr);
-       ret = register_ftrace_graph(&trace_graph_return,
-                                   &trace_graph_entry_watchdog);
+       ret = register_ftrace_graph(&fgraph_ops);
        if (ret) {
                warn_failed_init_tracer(trace, ret);
                goto out;