summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Rostedt (VMware) <rostedt@goodmis.org>2018-11-27 09:36:37 -0500
committerSteven Rostedt (VMware) <rostedt@goodmis.org>2018-11-29 23:38:34 -0500
commitc43ac4a5301986c015137bb89568979f9b3264ca (patch)
tree884f9caa7ee2692e48e3b378cbfe87fd4f3fb7e5
parent23621fac32ec9dbc4afada344cbf82b0f6281be3 (diff)
downloadlinux-stable-c43ac4a5301986c015137bb89568979f9b3264ca.tar.gz
linux-stable-c43ac4a5301986c015137bb89568979f9b3264ca.tar.bz2
linux-stable-c43ac4a5301986c015137bb89568979f9b3264ca.zip
tracing: Do not line wrap short line in function_graph_enter()
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>
-rw-r--r--kernel/trace/trace_functions_graph.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
index 086af4f5c3e8..0d235e44d08e 100644
--- a/kernel/trace/trace_functions_graph.c
+++ b/kernel/trace/trace_functions_graph.c
@@ -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 */