From patchwork Thu Jul 27 14:14:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Ghiti X-Patchwork-Id: 126998 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a985:0:b0:3e4:2afc:c1 with SMTP id t5csp1155680vqo; Thu, 27 Jul 2023 07:53:27 -0700 (PDT) X-Google-Smtp-Source: APBJJlH0WWSLJkkAHGIgxCazNJCdACaJeh/GhsPCtf4uODMmKD6mIlnga7gYT72KxWOmXM4s2C5w X-Received: by 2002:a17:90b:4b89:b0:268:2d6:74d6 with SMTP id lr9-20020a17090b4b8900b0026802d674d6mr4333511pjb.16.1690469606874; Thu, 27 Jul 2023 07:53:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690469606; cv=none; d=google.com; s=arc-20160816; b=wdqneAjPnENYD8gWVGTOB4psFNDezPxcaMixF1BLKq2R6Kr1A+pSgeuJD0FXew2vhP vNfusz2sM9XIYHMGLOeeSY2Ppq///h0kRHGxaF7ZRPPmvktBOVUu2Iagq9jKle3oSGoG bxSD1LqqrPFfqZmZZ2m8penzb3T8YVvM/cXgdomPjiEzhgLvYY8QWzTcOQs6HJw5hk8f qiLtqqtKHY7QteArGT3yrKfaIXO1Q7ovXOJ55K3iVmR5qhKskAqgeaU7rbeGtTQ6paDU hKyg5A91Rxpy+jmAD7203z0H5z49kjcOF1NAdS2LYpbYM1c7vf+s2K8CymIk8y+lqikx VQzA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=nFKT0CCXN0CmmHE2x8MUQw5sccSB1SdakxOhkM1UsG4=; fh=3aasexpimsDctYfRujpMylveySL8uNVvtqQmUTzOO2Q=; b=oz7q+D5RTpQLwqUFJDWtcZiLHgfDYlNBENa3sMD+zy8dzS6SVJqzlWFFOPpMGL5BsN 57QA/8671lQySpVGElLORC0F66lvdDKUXvVKZjqk+sxC4VQjEH3TfymsMJYdi3RelQG5 BT4F5cZJoPtKzsPj8YjNV47ErUVx0hkTX++icbe+s+5I2A5WblvfaOraovVTm7nNmcLX 3Z+JnJ205e0wYhWrB/J7u3KBrFb9fwWezBNeFLyVvHDpFi3oQO+S+nNsFjTaq11xbeJp GIH4a4XH7Hh8FDuKi3hVnyggsOS74kQEmP8l8WiXFAMGxeLDC/hu2Nl6dYpnudZz+26Y fXaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b="1D/LtkuW"; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x64-20020a638643000000b00563fce1544dsi1333037pgd.460.2023.07.27.07.52.48; Thu, 27 Jul 2023 07:53:26 -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=@rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b="1D/LtkuW"; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233454AbjG0OQs (ORCPT + 99 others); Thu, 27 Jul 2023 10:16:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51242 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233303AbjG0OQo (ORCPT ); Thu, 27 Jul 2023 10:16:44 -0400 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F188930E3 for ; Thu, 27 Jul 2023 07:16:41 -0700 (PDT) Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-3fd18b1d924so10279315e9.1 for ; Thu, 27 Jul 2023 07:16:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20221208.gappssmtp.com; s=20221208; t=1690467400; x=1691072200; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nFKT0CCXN0CmmHE2x8MUQw5sccSB1SdakxOhkM1UsG4=; b=1D/LtkuWMncLALJQA5Oohv9cG2Yw+utKrrqtK7JM1Yn+RymNvnSY9fFX1PAdOFVeFE +EX6RtgOuFxjr92TeijPn7uPEeNPprpopyNfm4DKu1YQS60vpDYm97TMm2WA9IjYgrq9 Z3b4kymmbenBoGqlHA4IGwvWqjIUqqdILO4p1ldIlhsqIgrkvJWVsxVRnD2pr40UmyvI GUkRgoCKbYOQGm+SSqgBoGHcyLTdDbsx0VDmg6KBrY1rScjMUOHT4RauNbC6fqgNdVIN KPlCA2ru+fvWXDWpul7da/vvCtyBhVp3gfp0i7CgchDcih5kFfwJsBrXkPJzk7TYoh+F k/Nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690467400; x=1691072200; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nFKT0CCXN0CmmHE2x8MUQw5sccSB1SdakxOhkM1UsG4=; b=ehPzB4LM8UE6EHKC2tYZD7JtNoX+a5QSW3EtNgBPaNlGYiwiNyaXD1fIQuGg7NYJdf vc8H/roKaPsxGr/TBJQdndJ52y2bVezrXSepDMZoBS8Da2akywnefsHARtKxFYBcD1iU RmaiDMVes4ZF3DS1a/oC/HvKr4WRfE2LcFgv5ImqmE+vxjlXwCRwTiiFFG9VZMfgE395 GcnQWafYeaG2ynt7jeRSZufXhgx0Ly6J9toDNI/Cu5pz4HyDQNrcVjftAHuU2bSNJZ+s rGAaSxR6VqQlP45iI4KcYvcpt9PDaSHkwwJERZOVkb/Mqi4zA7X/I4ylHELw5zqFG/tW lwlw== X-Gm-Message-State: ABy/qLYdsJNXJOqWBKl5cDlo4gqXlW8F02aEU3lEhwS/AF+pCbELOmiF Uv/3Iaab2oyCRmC4F/QbRml39Q== X-Received: by 2002:a05:600c:20d4:b0:3fb:c9f4:150e with SMTP id y20-20020a05600c20d400b003fbc9f4150emr1784324wmm.14.1690467400406; Thu, 27 Jul 2023 07:16:40 -0700 (PDT) Received: from alex-rivos.home (amontpellier-656-1-456-62.w92-145.abo.wanadoo.fr. [92.145.124.62]) by smtp.gmail.com with ESMTPSA id v16-20020a1cf710000000b003fc080acf68sm4789003wmh.34.2023.07.27.07.16.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jul 2023 07:16:39 -0700 (PDT) From: Alexandre Ghiti To: Jonathan Corbet , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Paul Walmsley , Palmer Dabbelt , Albert Ou , Atish Patra , Anup Patel , Will Deacon , Rob Herring , Andrew Jones , =?utf-8?q?R=C3=A9mi_Denis-Courmont?= , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-riscv@lists.infradead.org, linux-arm-kernel@lists.infradead.org Cc: Alexandre Ghiti , Conor Dooley , Atish Patra Subject: [PATCH v4 02/10] include: riscv: Fix wrong include guard in riscv_pmu.h Date: Thu, 27 Jul 2023 16:14:20 +0200 Message-Id: <20230727141428.962286-3-alexghiti@rivosinc.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230727141428.962286-1-alexghiti@rivosinc.com> References: <20230727141428.962286-1-alexghiti@rivosinc.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=unavailable 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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772585858413607115 X-GMAIL-MSGID: 1772585858413607115 The current include guard prevents the inclusion of asm/perf_event.h which uses the same include guard: fix the one in riscv_pmu.h so that it matches the file name. Signed-off-by: Alexandre Ghiti Reviewed-by: Conor Dooley Reviewed-by: Andrew Jones Reviewed-by: Atish Patra --- include/linux/perf/riscv_pmu.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/linux/perf/riscv_pmu.h b/include/linux/perf/riscv_pmu.h index 43fc892aa7d9..9f70d94942e0 100644 --- a/include/linux/perf/riscv_pmu.h +++ b/include/linux/perf/riscv_pmu.h @@ -6,8 +6,8 @@ * */ -#ifndef _ASM_RISCV_PERF_EVENT_H -#define _ASM_RISCV_PERF_EVENT_H +#ifndef _RISCV_PMU_H +#define _RISCV_PMU_H #include #include @@ -81,4 +81,4 @@ int riscv_pmu_get_hpm_info(u32 *hw_ctr_width, u32 *num_hw_ctr); #endif /* CONFIG_RISCV_PMU */ -#endif /* _ASM_RISCV_PERF_EVENT_H */ +#endif /* _RISCV_PMU_H */