diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-05-09 21:46:57 +0200 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2017-05-15 16:08:15 +0530 |
| commit | c3946fdababc6cc8f5c5086cc2087de9686d18db (patch) | |
| tree | 66186410127cdc284c0b3cac1ed04f53d43c5876 | |
| parent | 72480c28e5a3b1e230fcb1261aba876f04e0e8e0 (diff) | |
trace: fix trace_graph_ret_raw return type
As found by kernelci, an extraneous semicolon causes incorrect
behavior in one of the tracing functions:
kernel/trace/trace_output.c: In function 'trace_graph_ret_raw':
kernel/trace/trace_output.c:976:2: warning: this 'if' clause does not guard... [-Wmisleading-indentation]
if (!trace_seq_printf(&iter->seq, "%lx %lld %lld %ld %d\n",
^~
kernel/trace/trace_output.c:982:3: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'if'
return TRACE_TYPE_PARTIAL_LINE;
This removes the semicolon to make the function return success
correctly.
Link: https://kernelci.org/build/id/5910641d59b514cb17b12d4d/logs/
Fixes: 6f6f99a38132 ("trace: add non-hierarchical function_graph option")
Cc: Jamie Gennis <jgennis@google.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
| -rw-r--r-- | kernel/trace/trace_output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c index a2b8202d858a..540110ef18e6 100644 --- a/kernel/trace/trace_output.c +++ b/kernel/trace/trace_output.c @@ -1022,7 +1022,7 @@ static enum print_line_t trace_graph_ret_raw(struct trace_iterator *iter, int fl field->ret.calltime, field->ret.rettime, field->ret.overrun, - field->ret.depth)); + field->ret.depth)) return TRACE_TYPE_PARTIAL_LINE; return TRACE_TYPE_HANDLED; |