[for-next][PATCH 02/30] tracing: Do not line wrap short line in function_graph_enter()

From: Steven Rostedt
Date: Wed Dec 05 2018 - 18:51:10 EST


From: "Steven Rostedt (VMware)" <rostedt@xxxxxxxxxxx>

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@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx

Reported-by: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Signed-off-by: Steven Rostedt (VMware) <rostedt@xxxxxxxxxxx>
---
kernel/trace/trace_functions_graph.c | 3 +--
1 file changed, 1 insertion(+), 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 */
--
2.19.1