diff options
| author | Palmer Dabbelt <palmer@rivosinc.com> | 2023-03-15 06:51:34 +0300 |
|---|---|---|
| committer | Palmer Dabbelt <palmer@rivosinc.com> | 2023-03-15 06:51:34 +0300 |
| commit | 73bde0ca0ab5923d4a4bef1580db500065d350fb (patch) | |
| tree | 0e0d0da0fd1bb9acf2f9ef24035a998c17b6b463 /arch/riscv/lib/strncmp.S | |
| parent | 4a4c459872f154acf872dfa6baf5d1edabd52323 (diff) | |
| parent | 816a69744102bc886edc3557d00e840e3e35e7d5 (diff) | |
| download | linux-73bde0ca0ab5923d4a4bef1580db500065d350fb.tar.xz | |
Merge patch series "riscv: alternative/cpufeature related cleanups"
Andrew Jones <ajones@ventanamicro.com> says:
This series has no intended functional change. These cleanups were
found while renaming errata_id to patch_id in order to better
convey that its purpose is larger than errata (it's also for
cpufeatures).
* b4-shazam-merge:
riscv: cpufeature: Drop errata_list.h and other unused includes
riscv: lib: Include hwcap.h directly
riscv: alternatives: Rename errata_id to patch_id
riscv: alternatives: Remove unnecessary define and unused struct
riscv: Rename Kconfig.erratas to Kconfig.errata
riscv: Clarify RISCV_ALTERNATIVE help text
Link: https://lore.kernel.org/r/20230224154601.88163-1-ajones@ventanamicro.com
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
Diffstat (limited to 'arch/riscv/lib/strncmp.S')
| -rw-r--r-- | arch/riscv/lib/strncmp.S | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/riscv/lib/strncmp.S b/arch/riscv/lib/strncmp.S index 7ac2f667285a..aba5b3148621 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) |