From: Ben Hutchings <ben@decadent.org.uk>
To: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH perf 1/4] perf tools: Fix wrong indentation and build failure with gcc 6
Date: Tue, 19 Jan 2016 21:32:51 +0000 [thread overview]
Message-ID: <20160119213251.GC2637@decadent.org.uk> (raw)
In-Reply-To: <20160119213213.GB2637@decadent.org.uk>
[-- Attachment #1: Type: text/plain, Size: 989 bytes --]
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)
^~
Fixes: 410136f5dd96 ("tools/perf/stat: Add event unit and scale support")
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
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 e4b173d..c900b66 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;
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 811 bytes --]
next prev parent reply other threads:[~2016-01-19 21:33 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-19 21:32 [PATCH perf 0/4] Build fixes for gcc 6 Ben Hutchings
2016-01-19 21:32 ` Ben Hutchings [this message]
2016-01-19 21:32 ` [PATCH perf 2/4] perf top: Fix behaviour of Shift-Tab in annotated view with nothing focussed Ben Hutchings
2016-01-19 21:33 ` [PATCH perf 3/4] perf tools: Fix unused variables: x86_{32,64}_regoffset_table Ben Hutchings
2016-01-20 13:59 ` Arnaldo Carvalho de Melo
2016-01-21 4:43 ` Wangnan (F)
2016-01-21 15:38 ` Arnaldo Carvalho de Melo
2016-01-21 15:41 ` Arnaldo Carvalho de Melo
2016-01-22 1:26 ` Wangnan (F)
2016-01-22 5:56 ` 平松雅巳 / HIRAMATU,MASAMI
2016-01-22 6:19 ` Wangnan (F)
2016-01-22 7:59 ` 平松雅巳 / HIRAMATU,MASAMI
2016-01-19 21:33 ` [PATCH perf 4/4] perf tests: Delete mis-indented dead code that causes build failure with gcc 6 Ben Hutchings
2016-01-19 21:40 ` [PATCH perf 0/4] Build fixes for " Markus Trippelsdorf
2016-01-19 21:58 ` Ben Hutchings
2016-01-19 22:00 ` Markus Trippelsdorf
2016-01-19 22:04 ` Ben Hutchings
2016-01-19 22:28 ` Arnaldo Carvalho de Melo
2016-01-19 22:30 ` Arnaldo Carvalho de Melo
2016-01-19 22:43 ` Markus Trippelsdorf
2016-01-19 22:31 ` Markus Trippelsdorf
2016-01-20 13:20 ` Arnaldo Carvalho de Melo
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=20160119213251.GC2637@decadent.org.uk \
--to=ben@decadent.org.uk \
--cc=acme@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
/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.