From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757906AbcASVdR (ORCPT ); Tue, 19 Jan 2016 16:33:17 -0500 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:50551 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757865AbcASVc4 (ORCPT ); Tue, 19 Jan 2016 16:32:56 -0500 Date: Tue, 19 Jan 2016 21:32:51 +0000 From: Ben Hutchings To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo Cc: linux-kernel@vger.kernel.org Message-ID: <20160119213251.GC2637@decadent.org.uk> References: <20160119213213.GB2637@decadent.org.uk> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="eheScQNz3K90DVRs" Content-Disposition: inline In-Reply-To: <20160119213213.GB2637@decadent.org.uk> User-Agent: Mutt/1.5.23 (2014-03-12) X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: ben@decadent.org.uk Subject: [PATCH perf 1/4] perf tools: Fix wrong indentation and build failure with gcc 6 X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: Yes (on shadbolt.decadent.org.uk) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --eheScQNz3K90DVRs Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable One line in perf_pmu__parse_unit() is indented wrongly, leading to a warning (=3D> error) from gcc 6: util/pmu.c:156:3: error: statement is indented as if it were guarded by... = [-Werror=3Dmisleading-indentation] sret =3D read(fd, alias->unit, UNIT_MAX_LEN); ^~~~ util/pmu.c:153:2: note: ...this 'if' clause, but it is not if (fd =3D=3D -1) ^~ Fixes: 410136f5dd96 ("tools/perf/stat: Add event unit and scale support") Signed-off-by: Ben Hutchings --- 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 =3D=3D -1) return -1; =20 - sret =3D read(fd, alias->unit, UNIT_MAX_LEN); + sret =3D read(fd, alias->unit, UNIT_MAX_LEN); if (sret < 0) goto error; =20 --eheScQNz3K90DVRs Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIVAwUBVp6rgue/yOyVhhEJAQqyew//bEQ9KgiScobEbMPg0ERCK1qCcmhx3YyO q+OybTl5DR9LYahfVWfPfSd4GR+Wpi+1BEYgkAi1XyWrTKB3a7su8m64nAzuCCIj nv3lw02NJr9FYuJe/ZIUQFGufi6ukdp1+153TI/zaUVZutRIE2lcR2sE3FxF6XvI k7ls6x9Rcudgq+d6jjsWYaKYFUDsNfQSEpyfne/4M1uZ/thyxfHslSNm1RaeBRm/ okpIXQBo9RciPFtBQdqtwxU/Meiqah6+BdcFnfMCl6G15JvRVlZzBlSCsZzu5BYG Q9DjpF4YAwVilr0TDSX+2XuvbQ2fzs9KLZU3fvCnp/ezII2rQ3I5N/MOVcK15coU SXF7Dh3eyES11736dYpn1OdlH8HQPH8ux8/POzhrB+TC4gphV8rEUi8LE74Ar3cG Aw1QVb3USFA3XuwfM4iyMQ26cNFzzfcBsnXxPvsFP16zpnmE5yQu6Wk1rWC3Tczh /3JajA7m8nUJGLE+3So0sZccOvVoUsQ3+hjI7er9B9kz4W2uXiEQcGQIws0UOftj fXLJn7zo4c69cSkZQj4TNHqWtdUdAyIVqrKcRnB0zB02zA51kL9gGcP0jS8eD2EB 9a+UYgWbKP4KCH7kz6t9gzgsks9PS4xaA0MzooKUVAFunAstX+F0dCCwsUiWRaRo k8ZkUG9qz5M= =sqHz -----END PGP SIGNATURE----- --eheScQNz3K90DVRs--