summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Trippelsdorf <markus@trippelsdorf.de>2015-12-14 16:44:40 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-07-15 11:57:49 +0200
commit300d4fea8de01d33001c08268b890923f2d2e68b (patch)
treebfe91a9d7101ef3245b691614d1e0adb1c774085
parent0ba2f070bf4556b732633591c3a38f0248a8c3ec (diff)
downloadlinux-stable-300d4fea8de01d33001c08268b890923f2d2e68b.tar.gz
linux-stable-300d4fea8de01d33001c08268b890923f2d2e68b.tar.bz2
linux-stable-300d4fea8de01d33001c08268b890923f2d2e68b.zip
perf pmu: Fix misleadingly indented assignment (whitespace)
commit d85ce830eef6c10d1e9617172dea4681f02b8424 upstream. One line in perf_pmu__parse_unit() is indented wrongly, leading to a warning (=> error) from gcc 6: util/pmu.c:156:3: error: statement is indented as if it were guarded by... [-Werror=misleading-indentation] sret = read(fd, alias->unit, UNIT_MAX_LEN); ^~~~ util/pmu.c:153:2: note: ...this 'if' clause, but it is not if (fd == -1) ^~ Signed-off-by: Markus Trippelsdorf <markus@trippelsdorf.de> Acked-by: Ingo Molnar <mingo@kernel.org> Cc: Ben Hutchings <ben@decadent.org.uk> Cc: Matt Fleming <matt@codeblueprint.co.uk> Cc: Peter Zijlstra <peterz@infradead.org> Fixes: 410136f5dd96 ("tools/perf/stat: Add event unit and scale support") Link: http://lkml.kernel.org/r/20151214154440.GC1409@x4 Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--tools/perf/util/pmu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
index 6f2a0279476c..593066c68e3d 100644
--- a/tools/perf/util/pmu.c
+++ b/tools/perf/util/pmu.c
@@ -153,7 +153,7 @@ static int perf_pmu__parse_unit(struct perf_pmu_alias *alias, char *dir, char *n
if (fd == -1)
return -1;
- sret = read(fd, alias->unit, UNIT_MAX_LEN);
+ sret = read(fd, alias->unit, UNIT_MAX_LEN);
if (sret < 0)
goto error;