From: tip-bot for Markus Trippelsdorf <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: matt@codeblueprint.co.uk, tglx@linutronix.de,
ben@decadent.org.uk, markus@trippelsdorf.de, mingo@kernel.org,
acme@redhat.com, linux-kernel@vger.kernel.org, hpa@zytor.com,
peterz@infradead.org
Subject: [tip:perf/core] perf pmu: Fix misleadingly indented assignment ( whitespace)
Date: Wed, 3 Feb 2016 02:06:39 -0800 [thread overview]
Message-ID: <tip-d85ce830eef6c10d1e9617172dea4681f02b8424@git.kernel.org> (raw)
In-Reply-To: <20151214154440.GC1409@x4>
Commit-ID: d85ce830eef6c10d1e9617172dea4681f02b8424
Gitweb: http://git.kernel.org/tip/d85ce830eef6c10d1e9617172dea4681f02b8424
Author: Markus Trippelsdorf <markus@trippelsdorf.de>
AuthorDate: Mon, 14 Dec 2015 16:44:40 +0100
Committer: Arnaldo Carvalho de Melo <acme@redhat.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@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>
---
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;
prev parent reply other threads:[~2016-02-03 10:07 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-12 18:07 [PATCH] Fix misleading indentation issues in perf Markus Trippelsdorf
2015-12-14 8:19 ` Ingo Molnar
2015-12-14 10:46 ` Matt Fleming
2015-12-14 15:14 ` Arnaldo Carvalho de Melo
2015-12-14 15:43 ` [PATCH 1/3] Remove wrong semicolon in while loop Markus Trippelsdorf
2015-12-14 17:55 ` Arnaldo Carvalho de Melo
2016-01-30 8:24 ` [tip:perf/urgent] perf tests: Remove wrong semicolon in while loop in CQM test tip-bot for Markus Trippelsdorf
2015-12-14 15:44 ` [PATCH 2/3] Add missing braces to if statement Markus Trippelsdorf
2016-01-30 8:24 ` [tip:perf/urgent] perf annotate browser: Fix behaviour of Shift-Tab with nothing focussed tip-bot for Markus Trippelsdorf
2015-12-14 15:44 ` [PATCH 3/3] Fix misleadingly indented assignment (whitespace) Markus Trippelsdorf
2016-02-03 10:06 ` tip-bot for Markus Trippelsdorf [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-d85ce830eef6c10d1e9617172dea4681f02b8424@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@redhat.com \
--cc=ben@decadent.org.uk \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=markus@trippelsdorf.de \
--cc=matt@codeblueprint.co.uk \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.