diff options
| author | Heiko Carstens <hca@linux.ibm.com> | 2021-07-21 10:56:57 +0200 |
|---|---|---|
| committer | Heiko Carstens <hca@linux.ibm.com> | 2021-07-27 09:39:20 +0200 |
| commit | 511ad531afd4090625def4d9aba1f5227bd44b8e (patch) | |
| tree | ac43a26d80aa6d2957f6b8c4f028d12391c86b5e /arch/s390/include | |
| parent | 7e8403ecaf884f307b627f3c371475913dd29292 (diff) | |
s390/hwcaps: shorten HWCAP defines
Remove s390 part of all HWCAP defines, just to make them shorter and
easier to handle. The namespace is anyway per architecture.
This is similar to what arm64 has.
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Diffstat (limited to 'arch/s390/include')
| -rw-r--r-- | arch/s390/include/asm/cpufeature.h | 2 | ||||
| -rw-r--r-- | arch/s390/include/asm/elf.h | 44 |
2 files changed, 23 insertions, 23 deletions
diff --git a/arch/s390/include/asm/cpufeature.h b/arch/s390/include/asm/cpufeature.h index 1d007c6ede95..14cfd48d598e 100644 --- a/arch/s390/include/asm/cpufeature.h +++ b/arch/s390/include/asm/cpufeature.h @@ -23,7 +23,7 @@ #define MAX_ELF_HWCAP_FEATURES (8 * sizeof(elf_hwcap)) #define MAX_CPU_FEATURES MAX_ELF_HWCAP_FEATURES -#define cpu_feature(feat) ilog2(HWCAP_S390_ ## feat) +#define cpu_feature(feat) ilog2(HWCAP_ ## feat) int cpu_have_feature(unsigned int nr); diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h index 0291d45566a9..4c0eb4410fe3 100644 --- a/arch/s390/include/asm/elf.h +++ b/arch/s390/include/asm/elf.h @@ -92,28 +92,28 @@ #define R_390_NUM 61 /* Bits present in AT_HWCAP. */ -#define HWCAP_S390_ESAN3 1 -#define HWCAP_S390_ZARCH 2 -#define HWCAP_S390_STFLE 4 -#define HWCAP_S390_MSA 8 -#define HWCAP_S390_LDISP 16 -#define HWCAP_S390_EIMM 32 -#define HWCAP_S390_DFP 64 -#define HWCAP_S390_HPAGE 128 -#define HWCAP_S390_ETF3EH 256 -#define HWCAP_S390_HIGH_GPRS 512 -#define HWCAP_S390_TE 1024 -#define HWCAP_S390_VXRS 2048 -#define HWCAP_S390_VXRS_BCD 4096 -#define HWCAP_S390_VXRS_EXT 8192 -#define HWCAP_S390_GS 16384 -#define HWCAP_S390_VXRS_EXT2 32768 -#define HWCAP_S390_VXRS_PDE 65536 -#define HWCAP_S390_SORT 131072 -#define HWCAP_S390_DFLT 262144 -#define HWCAP_S390_VXRS_PDE2 524288 -#define HWCAP_S390_NNPA 1048576 -#define HWCAP_S390_PCI_MIO 2097152 +#define HWCAP_ESAN3 1 +#define HWCAP_ZARCH 2 +#define HWCAP_STFLE 4 +#define HWCAP_MSA 8 +#define HWCAP_LDISP 16 +#define HWCAP_EIMM 32 +#define HWCAP_DFP 64 +#define HWCAP_HPAGE 128 +#define HWCAP_ETF3EH 256 +#define HWCAP_HIGH_GPRS 512 +#define HWCAP_TE 1024 +#define HWCAP_VXRS 2048 +#define HWCAP_VXRS_BCD 4096 +#define HWCAP_VXRS_EXT 8192 +#define HWCAP_GS 16384 +#define HWCAP_VXRS_EXT2 32768 +#define HWCAP_VXRS_PDE 65536 +#define HWCAP_SORT 131072 +#define HWCAP_DFLT 262144 +#define HWCAP_VXRS_PDE2 524288 +#define HWCAP_NNPA 1048576 +#define HWCAP_PCI_MIO 2097152 /* Internal bits, not exposed via elf */ #define HWCAP_INT_SIE 1UL |