From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753885AbcBCKHa (ORCPT ); Wed, 3 Feb 2016 05:07:30 -0500 Received: from terminus.zytor.com ([198.137.202.10]:54284 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753176AbcBCKHZ (ORCPT ); Wed, 3 Feb 2016 05:07:25 -0500 Date: Wed, 3 Feb 2016 02:06:39 -0800 From: tip-bot for Markus Trippelsdorf Message-ID: 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 Reply-To: hpa@zytor.com, peterz@infradead.org, linux-kernel@vger.kernel.org, acme@redhat.com, mingo@kernel.org, ben@decadent.org.uk, markus@trippelsdorf.de, tglx@linutronix.de, matt@codeblueprint.co.uk In-Reply-To: <20151214154440.GC1409@x4> References: <20151214154440.GC1409@x4> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf pmu: Fix misleadingly indented assignment ( whitespace) Git-Commit-ID: d85ce830eef6c10d1e9617172dea4681f02b8424 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: d85ce830eef6c10d1e9617172dea4681f02b8424 Gitweb: http://git.kernel.org/tip/d85ce830eef6c10d1e9617172dea4681f02b8424 Author: Markus Trippelsdorf AuthorDate: Mon, 14 Dec 2015 16:44:40 +0100 Committer: Arnaldo Carvalho de Melo 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 Acked-by: Ingo Molnar Cc: Ben Hutchings Cc: Matt Fleming Cc: Peter Zijlstra 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 --- 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;