Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp1798265rwb; Fri, 12 Aug 2022 07:05:15 -0700 (PDT) X-Google-Smtp-Source: AA6agR6XjLOFNbQdwc+PJ1SZkOHiEHq18F6BYlAw1yn6DmQm16b0v64s2voFfQnAz+t+8aqlNREG X-Received: by 2002:a17:907:2d91:b0:731:2aeb:793d with SMTP id gt17-20020a1709072d9100b007312aeb793dmr2797414ejc.212.1660313115001; Fri, 12 Aug 2022 07:05:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660313114; cv=none; d=google.com; s=arc-20160816; b=ZtOg1IIZsKkC9qUb4HTXcfMVseBteyg1pQm53A3rNBH9KmxhzgSJGCpZCSPsnVBhKJ uvY3EeoijZ+D9yi9Ztp0k5K7lWqQ6g6k25VRxFdMhUvf7iawNx+SZa+sSxXOFRo8BkPU f77ZdQmiRztJQQa840eXlm3ipX1B1I5sMrkn7WN4d3F1wkdmkl5mBzcmlMoSbONyfxq+ TKcx6ba8WCPQqg0cPAfFw7Ki9Zp5FbzT6s8QKoDxvOG5eX8/A3GcfXUL71YCSOf0BI9g Pi7TI3Q0K/1JSQI6b9pkGVUbzzAe2uv2x+2+/jxtY6fdIS8dmgHQuQkDCm9sGl+6YM3U K0XQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=Tg/eBTLgE2jpti5tJjavr8o5noXFSs6BBoa/vVRB64s=; b=KXjryOfZNZ2vbwSajIaLtTTvk2wV/x1iuDIsx1+p8pr10cYl/whXjSZtZM7ztrTFsR OwkZn3p2XznIE/WpcD2qheQySQ4E0IMFl9NIqH/+WXpYn1N247t79Q/Of1n7QSfgBBdX 9A2ACzfbnQn9td2dvbMQCXN4Z0dPLDaJNd3VPAf5zaJz3gZHOINq580bRVP2LPbX+Hb+ 6wcBX86ExoAq9Z0QrCUAH8MqhWenlo+gdi+zsasAHyNpfOSU+vCyi7d3jwzy3Fm/99YQ ItTziFm7/qfQb4SkmJQZbOCw5FKIiywJ9ksnU+edx+rS8DZpdUXw89b4dB594qYgo861 GdwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microchip.com header.s=mchp header.b=yd4qGOY4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ez12-20020a056402450c00b0043c158735ddsi2183410edb.109.2022.08.12.07.04.48; Fri, 12 Aug 2022 07:05:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@microchip.com header.s=mchp header.b=yd4qGOY4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236346AbiHLNwW (ORCPT + 99 others); Fri, 12 Aug 2022 09:52:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40106 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231637AbiHLNwV (ORCPT ); Fri, 12 Aug 2022 09:52:21 -0400 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.153.233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C9ABFA8CC7 for ; Fri, 12 Aug 2022 06:52:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1660312338; x=1691848338; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=HDcTxaIToZQYcdvOhNn0jX4NVqCzNEAbPACHR8cmaC4=; b=yd4qGOY4BcLwV1FIMNPdC3dt2SUazuQy3VqVGBcURYXm2ljSCdfAgd79 MfzRtnlKIxRfPR0jAeYms/mVVnAOlqFCmogD0yfMhoEFhY8TKCzqEN3lM Se0GE21S0MIKGhAQrRKQ0y3kmzkikY1EDwgRjTm2P4Npuw+RyGuVa5GK/ 3xTwIRghh3ZylJUY6DZGnFsTVPpI9RtQBD1p+PczhUIx8VBIyIIZuWi5E v/yc4TYJeORQPkQgI36ji/DsAIS+bVd481KIzWY9culrChwpTrtMvNLlz 3/c8pHcttHoACQ7TiWi9Gggj5cFyqYgVcca8I25ahjvxV2pO6Mjd8nr+3 g==; X-IronPort-AV: E=Sophos;i="5.93,233,1654585200"; d="scan'208";a="176000719" Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa5.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 12 Aug 2022 06:52:18 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Fri, 12 Aug 2022 06:52:16 -0700 Received: from wendy.microchip.com (10.10.115.15) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server id 15.1.2375.17 via Frontend Transport; Fri, 12 Aug 2022 06:52:14 -0700 From: Conor Dooley To: Palmer Dabbelt , Palmer Dabbelt CC: Atish Patra , Anup Patel , Will Deacon , Mark Rutland , "Paul Walmsley" , Albert Ou , , , , Conor Dooley Subject: [PATCH] perf: riscv: fix broken build due to struct redefinition Date: Fri, 12 Aug 2022 14:51:20 +0100 Message-ID: <20220812135119.1648940-1-conor.dooley@microchip.com> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Spam-Status: No, score=-5.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Building riscv/for-next produces following error: drivers/perf/riscv_pmu_sbi.c:44:7: error: redefinition of 'sbi_pmu_ctr_info' union sbi_pmu_ctr_info { ^ arch/riscv/include/asm/sbi.h:125:7: note: previous definition is here union sbi_pmu_ctr_info { This appears to have been caused by a merge conflict resolution between riscv/for-next & riscv/fixes, causing the struct define not being properly moved to its header. Fixes: 9a7ccac63f9c ("perf: riscv_pmu{,_sbi}: Miscallenous improvement & fixes") Signed-off-by: Conor Dooley --- drivers/perf/riscv_pmu_sbi.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/drivers/perf/riscv_pmu_sbi.c b/drivers/perf/riscv_pmu_sbi.c index e7c6fecbf061..6f6681bbfd36 100644 --- a/drivers/perf/riscv_pmu_sbi.c +++ b/drivers/perf/riscv_pmu_sbi.c @@ -41,20 +41,6 @@ static const struct attribute_group *riscv_pmu_attr_groups[] = { NULL, }; -union sbi_pmu_ctr_info { - unsigned long value; - struct { - unsigned long csr:12; - unsigned long width:6; -#if __riscv_xlen == 32 - unsigned long reserved:13; -#else - unsigned long reserved:45; -#endif - unsigned long type:1; - }; -}; - /* * RISC-V doesn't have hetergenous harts yet. This need to be part of * per_cpu in case of harts with different pmu counters -- 2.36.1