Skip to content

Commit

Permalink
tracing: Do not line wrap short line in function_graph_enter()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Steven Rostedt (VMware) committed Nov 30, 2018
1 parent 23621fa commit c43ac4a
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions kernel/trace/trace_functions_graph.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit c43ac4a

Please sign in to comment.