From 52d6734b317b65d55ebcd352ed360d8a58a8b018 Mon Sep 17 00:00:00 2001 From: Seung-Woo Kim Date: Sat, 21 Jan 2017 12:09:30 +0900 Subject: [PATCH] trace: remove invalid semicolon after if clause The commit 6f6f99a38132 ("trace: add non-hierarchical function_graph option"), in https://android.googlesource.com/kernel/common.git/+/android-3.18, added invalid semicolon after if clause, so it causes following build error on gcc 6, so this patch removes the invalid seimicolon. kernel/trace/trace_output.c: In function 'trace_graph_ret_raw': kernel/trace/trace_output.c:976:2: error: this 'if' clause does not guard... [-Werror=misleading-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; ^~~~~~ Signed-off-by: Seung-Woo Kim --- kernel/trace/trace_output.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c index 79da717..1f0ee09 100644 --- a/kernel/trace/trace_output.c +++ b/kernel/trace/trace_output.c @@ -978,7 +978,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; -- 2.7.4