diff options
| author | Heiko Carstens <hca@linux.ibm.com> | 2021-07-21 14:03:33 +0200 |
|---|---|---|
| committer | Heiko Carstens <hca@linux.ibm.com> | 2021-07-27 09:39:21 +0200 |
| commit | 7e82523f2583e9813e4109df3656707162541297 (patch) | |
| tree | 9f851ca4f155581042310025459cb10cb3a826e9 /arch/s390/include/asm | |
| parent | 98ac9169e5407510c70621a2106005b26d4d304a (diff) | |
| download | linux-7e82523f2583e9813e4109df3656707162541297.tar.bz2 | |
s390/hwcaps: make sie capability regular hwcap
Commit 7f16d7e787b7 ("s390: show virtualization support in /proc/cpuinfo")
introduced special handling for sie capability, saying this should not be
exposed via hwcaps, without giving a reason.
However this leads to an inconsistent /proc/cpuinfo features line
where all features except the sie capability are also present in
hwcaps. I really don't see a reason to not add that to hwcaps - it
might be quite pointless, but at least this way it is possible to get
rid of some special handling.
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Diffstat (limited to 'arch/s390/include/asm')
| -rw-r--r-- | arch/s390/include/asm/elf.h | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h index f02273831473..70a30ae258b7 100644 --- a/arch/s390/include/asm/elf.h +++ b/arch/s390/include/asm/elf.h @@ -114,6 +114,7 @@ enum { HWCAP_NR_VXRS_PDE2 = 19, HWCAP_NR_NNPA = 20, HWCAP_NR_PCI_MIO = 21, + HWCAP_NR_SIE = 22, HWCAP_NR_MAX }; @@ -140,14 +141,7 @@ enum { #define HWCAP_VXRS_PDE2 BIT(HWCAP_NR_VXRS_PDE2) #define HWCAP_NNPA BIT(HWCAP_NR_NNPA) #define HWCAP_PCI_MIO BIT(HWCAP_NR_PCI_MIO) - -enum { - HWCAP_INT_NR_SIE = 0, - HWCAP_INT_NR_MAX -}; - -/* Internal bits, not exposed via elf */ -#define HWCAP_INT_SIE BIT(HWCAP_INT_NR_SIE) +#define HWCAP_SIE BIT(HWCAP_NR_SIE) /* * These are used to set parameters in the core dumps. @@ -243,10 +237,6 @@ struct arch_elf_state { extern unsigned long elf_hwcap; #define ELF_HWCAP (elf_hwcap) -/* Internal hardware capabilities, not exposed via elf */ - -extern unsigned long int_hwcap; - /* This yields a string that ld.so will use to load implementation specific libraries for optimization. This is more specific in intent than poking at uname or /proc/cpuinfo. |