From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 146DEC2D0A3 for ; Mon, 26 Oct 2020 21:52:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CA6DA21655 for ; Mon, 26 Oct 2020 21:52:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603749133; bh=v6OsJivCdqa8FhOgFvDk5JK3W+zbBx3yaUVMWwwWQvc=; h=From:To:Cc:Subject:Date:List-ID:From; b=iNrn8Jm/VyKAYlRWHHhoKJhV5hKGOq6Hri51vHEsj6zQsqgxf4HkEIAjH/Icc2K4W yF36iQK78V+3NP8PbNo+Ck4w8yGwewrjnkAoiGR+37M7CYZ5tzpAMwAkiYlby7qPNY f0FT7N0l1nZWmj7rA3Hzw+f6lhzvTaio/SiMiLh0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390988AbgJZVwM (ORCPT ); Mon, 26 Oct 2020 17:52:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:51940 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390424AbgJZVwM (ORCPT ); Mon, 26 Oct 2020 17:52:12 -0400 Received: from localhost.localdomain (unknown [192.30.34.233]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id AC8FE2084C; Mon, 26 Oct 2020 21:52:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603749131; bh=v6OsJivCdqa8FhOgFvDk5JK3W+zbBx3yaUVMWwwWQvc=; h=From:To:Cc:Subject:Date:From; b=BxA2YZqjTyWIqNjLHBHj2zO4GoKKXVxgO0rzh5dgmrUaNu/HjVIdq1k+yR+7C1m3P Qdfg12ta7m5CbYf7Ynz7yEtIpAejDD9EIEhe51afSRPCZbglz7OZx4L6B9oIiAsTfo btwvYqcrqMSjaOZzd20QSXW5bG86OEmLpfq+ZdoI= From: Arnd Bergmann To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Thomas Gleixner , Borislav Petkov , x86@kernel.org, Vaibhav Shankar Cc: Arnd Bergmann , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , "H. Peter Anvin" , Kan Liang , Andi Kleen , linux-kernel@vger.kernel.org Subject: [PATCH] perf/x86/intel/uncore: fix Add BW copypasta Date: Mon, 26 Oct 2020 22:51:57 +0100 Message-Id: <20201026215203.3893972-1-arnd@kernel.org> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann gcc -Wextra points out a duplicate initialization of one array member: arch/x86/events/intel/uncore_snb.c:478:37: warning: initialized field overwritten [-Woverride-init] 478 | [SNB_PCI_UNCORE_IMC_DATA_READS] = { SNB_UNCORE_PCI_IMC_DATA_WRITES_BASE, The only sensible explanation is that a duplicate 'READS' was used instead of the correct 'WRITES', so change it back. Fixes: 24633d901ea4 ("perf/x86/intel/uncore: Add BW counters for GT, IA and IO breakdown") Signed-off-by: Arnd Bergmann --- arch/x86/events/intel/uncore_snb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/events/intel/uncore_snb.c b/arch/x86/events/intel/uncore_snb.c index 39e632ed6ca9..bbd1120ae161 100644 --- a/arch/x86/events/intel/uncore_snb.c +++ b/arch/x86/events/intel/uncore_snb.c @@ -475,7 +475,7 @@ enum perf_snb_uncore_imc_freerunning_types { static struct freerunning_counters snb_uncore_imc_freerunning[] = { [SNB_PCI_UNCORE_IMC_DATA_READS] = { SNB_UNCORE_PCI_IMC_DATA_READS_BASE, 0x0, 0x0, 1, 32 }, - [SNB_PCI_UNCORE_IMC_DATA_READS] = { SNB_UNCORE_PCI_IMC_DATA_WRITES_BASE, + [SNB_PCI_UNCORE_IMC_DATA_WRITES] = { SNB_UNCORE_PCI_IMC_DATA_WRITES_BASE, 0x0, 0x0, 1, 32 }, [SNB_PCI_UNCORE_IMC_GT_REQUESTS] = { SNB_UNCORE_PCI_IMC_GT_REQUESTS_BASE, 0x0, 0x0, 1, 32 }, -- 2.27.0