Merge tag 'ktest-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[linux-2.6-microblaze.git] / kernel / trace / trace_functions_graph.c

diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
index 4a9c49c..d874dec 100644 (file)
--- a/kernel/trace/trace_functions_graph.c
+++ b/kernel/trace/trace_functions_graph.c
@@ -957,7 +957,7 @@ print_graph_return(struct ftrace_graph_ret *trace, struct trace_seq *s,
 
        /* Overrun */
        if (flags & TRACE_GRAPH_PRINT_OVERRUN)
-               trace_seq_printf(s, " (Overruns: %lu)\n",
+               trace_seq_printf(s, " (Overruns: %u)\n",
                                 trace->overrun);
 
        print_graph_irq(iter, trace->func, TRACE_GRAPH_RET,
@@ -1336,13 +1336,13 @@ static const struct file_operations graph_depth_fops = {
 
 static __init int init_graph_tracefs(void)
 {
-       struct dentry *d_tracer;
+       int ret;
 
-       d_tracer = tracing_init_dentry();
-       if (IS_ERR(d_tracer))
+       ret = tracing_init_dentry();
+       if (ret)
                return 0;
 
-       trace_create_file("max_graph_depth", 0644, d_tracer,
+       trace_create_file("max_graph_depth", 0644, NULL,
                          NULL, &graph_depth_fops);
 
        return 0;