From: Andrew Jones <ajones@ventanamicro.com>
To: linux-riscv@lists.infradead.org
Cc: 'Paul Walmsley ' <paul.walmsley@sifive.com>,
'Jisheng Zhang ' <jszhang@kernel.org>,
'Palmer Dabbelt ' <palmer@dabbelt.com>,
'Heiko Stuebner ' <heiko@sntech.de>,
'Conor Dooley ' <conor.dooley@microchip.com>,
'Albert Ou ' <aou@eecs.berkeley.edu>,
Heiko Stuebner <heiko.stuebner@vrull.eu>
Subject: [PATCH v2 5/6] riscv: lib: Include hwcap.h directly
Date: Fri, 24 Feb 2023 16:46:00 +0100 [thread overview]
Message-ID: <20230224154601.88163-6-ajones@ventanamicro.com> (raw)
In-Reply-To: <20230224154601.88163-1-ajones@ventanamicro.com>
When using alternatives for cpufeatures we should include hwcap.h
directly, rather than through errata_list.h. Opportunistically drop
an unused include too.
Signed-off-by: Andrew Jones <ajones@ventanamicro.com>
Reviewed-by: Conor Dooley <conor.dooley@microchip.com>
Reviewed-by: Heiko Stuebner <heiko.stuebner@vrull.eu>
---
arch/riscv/lib/strcmp.S | 3 +--
arch/riscv/lib/strlen.S | 3 +--
arch/riscv/lib/strncmp.S | 3 +--
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/arch/riscv/lib/strcmp.S b/arch/riscv/lib/strcmp.S
index 986ab23fe787..4f9b80dfb5db 100644
--- a/arch/riscv/lib/strcmp.S
+++ b/arch/riscv/lib/strcmp.S
@@ -2,9 +2,8 @@
#include <linux/linkage.h>
#include <asm/asm.h>
-#include <asm-generic/export.h>
#include <asm/alternative-macros.h>
-#include <asm/errata_list.h>
+#include <asm/hwcap.h>
/* int strcmp(const char *cs, const char *ct) */
SYM_FUNC_START(strcmp)
diff --git a/arch/riscv/lib/strlen.S b/arch/riscv/lib/strlen.S
index 8345ceeee3f6..ed78449f2e05 100644
--- a/arch/riscv/lib/strlen.S
+++ b/arch/riscv/lib/strlen.S
@@ -2,9 +2,8 @@
#include <linux/linkage.h>
#include <asm/asm.h>
-#include <asm-generic/export.h>
#include <asm/alternative-macros.h>
-#include <asm/errata_list.h>
+#include <asm/hwcap.h>
/* int strlen(const char *s) */
SYM_FUNC_START(strlen)
diff --git a/arch/riscv/lib/strncmp.S b/arch/riscv/lib/strncmp.S
index ee49595075be..e4e97d9b4e4e 100644
--- a/arch/riscv/lib/strncmp.S
+++ b/arch/riscv/lib/strncmp.S
@@ -2,9 +2,8 @@
#include <linux/linkage.h>
#include <asm/asm.h>
-#include <asm-generic/export.h>
#include <asm/alternative-macros.h>
-#include <asm/errata_list.h>
+#include <asm/hwcap.h>
/* int strncmp(const char *cs, const char *ct, size_t count) */
SYM_FUNC_START(strncmp)
--
2.39.1
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
next prev parent reply other threads:[~2023-02-24 15:46 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-24 15:45 [PATCH v2 0/6] riscv: alternative/cpufeature related cleanups Andrew Jones
2023-02-24 15:45 ` [PATCH v2 1/6] riscv: Clarify RISCV_ALTERNATIVE help text Andrew Jones
2023-02-24 15:45 ` [PATCH v2 2/6] riscv: Rename Kconfig.erratas to Kconfig.errata Andrew Jones
2023-02-24 15:53 ` Ben Dooks
2023-03-15 4:35 ` Palmer Dabbelt
2023-02-24 15:45 ` [PATCH v2 3/6] riscv: alternatives: Remove unnecessary define and unused struct Andrew Jones
2023-02-24 15:45 ` [PATCH v2 4/6] riscv: alternatives: Rename errata_id to patch_id Andrew Jones
2023-02-24 15:46 ` Andrew Jones [this message]
2023-02-24 15:46 ` [PATCH v2 6/6] riscv: cpufeature: Drop errata_list.h and other unused includes Andrew Jones
2023-03-18 1:00 ` [PATCH v2 0/6] riscv: alternative/cpufeature related cleanups patchwork-bot+linux-riscv
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230224154601.88163-6-ajones@ventanamicro.com \
--to=ajones@ventanamicro.com \
--cc=aou@eecs.berkeley.edu \
--cc=conor.dooley@microchip.com \
--cc=heiko.stuebner@vrull.eu \
--cc=heiko@sntech.de \
--cc=jszhang@kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox