RISC-V: Remove the removed single-letter extensions

There were a few single-letter extensions that we had references to
floating around in the kernel, but that never ended up as actual ISA
specs and have mostly been replaced by multi-letter extensions.  This
removes the references to those extensions.

Reviewed-by: Conor Dooley <conor.dooley@microchip.com>
Link: https://lore.kernel.org/r/20231110175903.2631-1-palmer@rivosinc.com
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>

diff --git a/arch/riscv/include/asm/hwcap.h b/arch/riscv/include/asm/hwcap.h
index 2438d4685da67131b1a521a6d6e8a82736948fa8..e1a0bd4f394afe93864d463228444dd1692e3636 100644 (file)
--- a/arch/riscv/include/asm/hwcap.h
+++ b/arch/riscv/include/asm/hwcap.h
@@ -11,19 +11,13 @@
 #include <uapi/asm/hwcap.h>
 
 #define RISCV_ISA_EXT_a                ('a' - 'a')
-#define RISCV_ISA_EXT_b                ('b' - 'a')
 #define RISCV_ISA_EXT_c                ('c' - 'a')
 #define RISCV_ISA_EXT_d                ('d' - 'a')
 #define RISCV_ISA_EXT_f                ('f' - 'a')
 #define RISCV_ISA_EXT_h                ('h' - 'a')
 #define RISCV_ISA_EXT_i                ('i' - 'a')
-#define RISCV_ISA_EXT_j                ('j' - 'a')
-#define RISCV_ISA_EXT_k                ('k' - 'a')
 #define RISCV_ISA_EXT_m                ('m' - 'a')
-#define RISCV_ISA_EXT_p                ('p' - 'a')
 #define RISCV_ISA_EXT_q                ('q' - 'a')
-#define RISCV_ISA_EXT_s                ('s' - 'a')
-#define RISCV_ISA_EXT_u                ('u' - 'a')
 #define RISCV_ISA_EXT_v                ('v' - 'a')
 
 /*

diff --git a/arch/riscv/kernel/cpufeature.c b/arch/riscv/kernel/cpufeature.c
index dc0ab3e97cd28a67eb32f621328523a10b98900c..b06c8830a1949aa47e846998a9ba0b604436cb50 100644 (file)
--- a/arch/riscv/kernel/cpufeature.c
+++ b/arch/riscv/kernel/cpufeature.c
@@ -244,10 +244,6 @@ const struct riscv_isa_ext_data riscv_isa_ext[] = {
        __RISCV_ISA_EXT_DATA(d, RISCV_ISA_EXT_d),
        __RISCV_ISA_EXT_DATA(q, RISCV_ISA_EXT_q),
        __RISCV_ISA_EXT_DATA(c, RISCV_ISA_EXT_c),
-       __RISCV_ISA_EXT_DATA(b, RISCV_ISA_EXT_b),
-       __RISCV_ISA_EXT_DATA(k, RISCV_ISA_EXT_k),
-       __RISCV_ISA_EXT_DATA(j, RISCV_ISA_EXT_j),
-       __RISCV_ISA_EXT_DATA(p, RISCV_ISA_EXT_p),
        __RISCV_ISA_EXT_DATA(v, RISCV_ISA_EXT_v),
        __RISCV_ISA_EXT_DATA(h, RISCV_ISA_EXT_h),
        __RISCV_ISA_EXT_DATA(zicbom, RISCV_ISA_EXT_ZICBOM),