From patchwork Wed Aug 2 08:03: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: 129714 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp310773vqx; Wed, 2 Aug 2023 01:56:52 -0700 (PDT) X-Google-Smtp-Source: APBJJlH1n6MFlCFcpGMqXwmQIcFc85fPILXZZsij6Ka6j6Ho3yR5Rw6utSfCX9ZilmWnTBKGyt2x X-Received: by 2002:a17:902:988e:b0:1b6:72af:623d with SMTP id s14-20020a170902988e00b001b672af623dmr14009954plp.55.1690966612511; Wed, 02 Aug 2023 01:56:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690966612; cv=none; d=google.com; s=arc-20160816; b=eEeW0FS2uIWMkR8ihIWiaArs109HDbYioGj4/Kams5VQ0pRAEcK9Q80EDDmimyuQj+ Q+SOkf6EQZvGh/8fXnwxI5pu5JR1+0pysFlqNbOMjZK/5WYHNd+qB6NKEXUag1VvEJmZ I17YLNZYmkCSaPMhi26VV+Lc70r4+60Yx2XWvzCFfZ52/0sPKfZu6Q3jmVBEG46Qbk+3 3Bi1SkehgKkKGHnyzEpSdwio2//SJwluC1H7mdMU83ACKVMRzpQ33PdWDFPWo5nn6OCh +s9OPyPJZRW0daloUmFVZ42QXAin4aDKR1tgQv/RxYWcQsZgDGOBOXcQbhkGQfvMixNU EZdA== 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=kssmFz5RNSxk6i2lu3NS1v0vH5D1fIHf1T/6KluHjKj/FYUSWkyrs4Q4Q8NCLCu0Jr H8/gboOUR+AJ2ssjGAM9V2PMS22/2T2rqFTYe6Vwvdc0OzK151BDHZ7PE5funF6sAPZ/ koOo2D9Mn9LaYKy1oA8GhwCtdnOgqn7Otoj9cepwiwlrFuxo7B8N7ePu1xasV8dwI+TF Fng1+I0RJxSHjEcIIW3NTZh8CHk+qQxVJvkZOZMKdTMdCG8rLrGFJzsPv25meLY8q/W6 fXzFM0wruv39NPhoCGJa91wum0UTwliW0QorgbU1AqOa9TTHxtkTlp61IzeLtEIcb6s5 3qnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=Adz4V7eb; 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 i2-20020a170902c94200b001bb9c2bc8aasi11013024pla.401.2023.08.02.01.56.38; Wed, 02 Aug 2023 01:56:52 -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=Adz4V7eb; 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 S231466AbjHBIGJ (ORCPT + 99 others); Wed, 2 Aug 2023 04:06:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33072 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232508AbjHBIGH (ORCPT ); Wed, 2 Aug 2023 04:06:07 -0400 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 10398EC for ; Wed, 2 Aug 2023 01:06:06 -0700 (PDT) Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-3fe2048c910so28055125e9.1 for ; Wed, 02 Aug 2023 01:06:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20221208.gappssmtp.com; s=20221208; t=1690963564; x=1691568364; 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=Adz4V7ebnS4I/sTqKU8RSqQEnKbk+n8KbATevT3pt2JKoSYYQPOQxfDEVEBfvip2nx AngRsIDgef7MaOxkLUmDETDs6o8j015PBBys0v/5d1MMOsHH3wCG0pMzCQ+boByDZJzW WXik2xuDgv/KfsnxBicFvsOoSJVq8bx2MDTxE8SLF1FC9QhLAM1J6Ux9ZeRZzpytge6i JbFsreahsXB+e74yq7ZevOSM9Wiyv+5NvC8D+bdJyNm5uYQd2Jz5DFeO+kjORGPLNy5y 8ND7l4FtK3RsDrDHLAeY5MPDyZWtGoR+6ygXi0vJ9janNWqopEiqBN65X7PN//eY3QbX 7gvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690963564; x=1691568364; 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=RLNKOaeiUBugh00MTQFz6FI8FdYXem6eYExkkuYqYIO505hYExC25+/H1+zUnQZ94n VHCOloZOHOn8W/QXho70FwLB8sIpFWFFm3/ELkBAlXnj4Pq8+foI0iCBq1iGrYKaM8aM f93YLngBomIjP6yF/P+XRqgdf5ilhst461lkgSc+Nwg9hrk6nZEb4or1MgDfRLPYYi6v QslNsrbDmzwSXxHmb9zpXXrPMyFCFvSOsKibp02oudgBDRQU4LTIhORLgZ/p/Qk2l8pv tJLoTEzv9LMHgVxd5Ld6eWE1HYiPVkpmNIidUYdCuFGDYj+yUG9S4Jf2BErHixoHTHgk P9Vw== X-Gm-Message-State: ABy/qLb1FXks6dhHmNYmFBIjHOayrJLA58cuWZZNzacjNB8LEvHw20Hc u7vV3611GS0tWTdzcwt4aYmfpw== X-Received: by 2002:a5d:654b:0:b0:314:1f6:2c24 with SMTP id z11-20020a5d654b000000b0031401f62c24mr4197414wrv.36.1690963564470; Wed, 02 Aug 2023 01:06:04 -0700 (PDT) Received: from alex-rivos.ba.rivosinc.com (amontpellier-656-1-456-62.w92-145.abo.wanadoo.fr. [92.145.124.62]) by smtp.gmail.com with ESMTPSA id z8-20020adfec88000000b0031773a8e5c4sm18156602wrn.37.2023.08.02.01.06.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Aug 2023 01:06:04 -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 v6 02/10] include: riscv: Fix wrong include guard in riscv_pmu.h Date: Wed, 2 Aug 2023 10:03:20 +0200 Message-Id: <20230802080328.1213905-3-alexghiti@rivosinc.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230802080328.1213905-1-alexghiti@rivosinc.com> References: <20230802080328.1213905-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_BLOCKED,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: 1773107006693063388 X-GMAIL-MSGID: 1773107006693063388 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 */