]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
tracing: Do not line wrap short line in function_graph_enter()
authorSteven Rostedt (VMware) <rostedt@goodmis.org>
Tue, 27 Nov 2018 14:36:37 +0000 (09:36 -0500)
committerSteven Rostedt (VMware) <rostedt@goodmis.org>
Fri, 30 Nov 2018 04:38:34 +0000 (23:38 -0500)
Commit 588ca1786f2dd ("function_graph: Use new curr_ret_depth to manage
depth instead of curr_ret_stack") removed a parameter from the call
ftrace_push_return_trace() that made it so that the entire call was under 80
characters, but it did not remove the line break. There's no reason to break
that line up, so make it a single line.

Link: http://lkml.kernel.org/r/20181122100322.GN2131@hirez.programming.kicks-ass.net
Reported-by: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
kernel/trace/trace_functions_graph.c

index 086af4f5c3e846755f7c0da269bf6cda70b4893c..0d235e44d08ec093517b75c347aa55880790591e 100644 (file)
@@ -188,8 +188,7 @@ int function_graph_enter(unsigned long ret, unsigned long func,
        trace.func = func;
        trace.depth = ++current->curr_ret_depth;
 
-       if (ftrace_push_return_trace(ret, func,
-                                    frame_pointer, retp))
+       if (ftrace_push_return_trace(ret, func, frame_pointer, retp))
                goto out;
 
        /* Only trace if the calling function expects to */