[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-d85ce830eef6c10d1e9617172dea4681f02b8424@git.kernel.org>
Date: Wed, 3 Feb 2016 02:06:39 -0800
From: tip-bot for Markus Trippelsdorf <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: matt@...eblueprint.co.uk, tglx@...utronix.de, ben@...adent.org.uk,
markus@...ppelsdorf.de, mingo@...nel.org, acme@...hat.com,
linux-kernel@...r.kernel.org, hpa@...or.com, peterz@...radead.org
Subject: [tip:perf/core] perf pmu: Fix misleadingly indented assignment (
whitespace)
Commit-ID: d85ce830eef6c10d1e9617172dea4681f02b8424
Gitweb: http://git.kernel.org/tip/d85ce830eef6c10d1e9617172dea4681f02b8424
Author: Markus Trippelsdorf <markus@...ppelsdorf.de>
AuthorDate: Mon, 14 Dec 2015 16:44:40 +0100
Committer: Arnaldo Carvalho de Melo <acme@...hat.com>
CommitDate: Tue, 26 Jan 2016 11:52:42 -0300
perf pmu: Fix misleadingly indented assignment (whitespace)
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@...ppelsdorf.de>
Acked-by: Ingo Molnar <mingo@...nel.org>
Cc: Ben Hutchings <ben@...adent.org.uk>
Cc: Matt Fleming <matt@...eblueprint.co.uk>
Cc: Peter Zijlstra <peterz@...radead.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@...hat.com>
---
tools/perf/util/pmu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
index b597bcc..41a9c87 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;
Powered by blists - more mailing lists