diff options
| author | Andrew Murray <andrew.murray@arm.com> | 2019-04-09 11:52:41 +0200 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2019-04-16 17:27:35 +0200 |
| commit | aec0bff757c937489d003ab7b36c52e77e4b096a (patch) | |
| tree | 3ce7e91045b1b1265a7d6ad3b708325fafec8074 /arch/arm64/include/asm/hwcap.h | |
| parent | arm64: HWCAP: add support for AT_HWCAP2 (diff) | |
| download | linux-aec0bff757c937489d003ab7b36c52e77e4b096a.tar.xz linux-aec0bff757c937489d003ab7b36c52e77e4b096a.zip | |
arm64: HWCAP: encapsulate elf_hwcap
The introduction of AT_HWCAP2 introduced accessors which ensure that
hwcap features are set and tested appropriately.
Let's now mandate access to elf_hwcap via these accessors by making
elf_hwcap static within cpufeature.c.
Signed-off-by: Andrew Murray <andrew.murray@arm.com>
Reviewed-by: Dave Martin <Dave.Martin@arm.com>
Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64/include/asm/hwcap.h')
| -rw-r--r-- | arch/arm64/include/asm/hwcap.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm64/include/asm/hwcap.h b/arch/arm64/include/asm/hwcap.h index af868cbe96f8..a843b6efce5b 100644 --- a/arch/arm64/include/asm/hwcap.h +++ b/arch/arm64/include/asm/hwcap.h @@ -17,6 +17,7 @@ #define __ASM_HWCAP_H #include <uapi/asm/hwcap.h> +#include <asm/cpufeature.h> #define COMPAT_HWCAP_HALF (1 << 1) #define COMPAT_HWCAP_THUMB (1 << 2) @@ -40,7 +41,6 @@ #define COMPAT_HWCAP2_CRC32 (1 << 4) #ifndef __ASSEMBLY__ -#include <linux/kernel.h> #include <linux/log2.h> /* @@ -93,8 +93,8 @@ * This yields a mask that user programs can use to figure out what * instruction set this cpu supports. */ -#define ELF_HWCAP lower_32_bits(elf_hwcap) -#define ELF_HWCAP2 upper_32_bits(elf_hwcap) +#define ELF_HWCAP cpu_get_elf_hwcap() +#define ELF_HWCAP2 cpu_get_elf_hwcap2() #ifdef CONFIG_COMPAT #define COMPAT_ELF_HWCAP (compat_elf_hwcap) @@ -110,6 +110,5 @@ enum { #endif }; -extern unsigned long elf_hwcap; #endif #endif |