diff options
| author | Andrew Pinski <apinski@cavium.com> | 2014-09-03 14:19:07 -0700 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-03-06 18:49:58 +0300 |
| commit | 9bdd5273f95fd6989c05cc48821000f1b0a0fc0d (patch) | |
| tree | fd4b444b5f0ad98655a823a21912f87a816af004 | |
| parent | a8f7b531fbb0217b6d3685a5aee36ca73785d9af (diff) | |
ARM64:ILP32: Use the non compat HWCAP for ILP32
Signed-off-by: Andrew Pinski <apinski@cavium.com>
| -rw-r--r-- | arch/arm64/include/asm/compat.h | 10 | ||||
| -rw-r--r-- | arch/arm64/include/asm/hwcap.h | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/arch/arm64/include/asm/compat.h b/arch/arm64/include/asm/compat.h index 709b76fdd7b4..af591713e675 100644 --- a/arch/arm64/include/asm/compat.h +++ b/arch/arm64/include/asm/compat.h @@ -302,6 +302,16 @@ struct compat_shmid64_ds { compat_ulong_t __unused5; }; +#define COMPAT_ELF_HWCAP \ + (is_a32_compat_task() \ + ? compat_elf_hwcap \ + : elf_hwcap) + +#define COMPAT_ELF_HWCAP2 \ + (is_a32_compat_task() \ + ? compat_elf_hwcap2 \ + : 0) + static inline int is_compat_task(void) { return test_thread_flag(TIF_32BIT); diff --git a/arch/arm64/include/asm/hwcap.h b/arch/arm64/include/asm/hwcap.h index 0ad735166d9f..8b09fd1620dd 100644 --- a/arch/arm64/include/asm/hwcap.h +++ b/arch/arm64/include/asm/hwcap.h @@ -47,8 +47,6 @@ #define ELF_HWCAP (elf_hwcap) #ifdef CONFIG_COMPAT -#define COMPAT_ELF_HWCAP (compat_elf_hwcap) -#define COMPAT_ELF_HWCAP2 (compat_elf_hwcap2) extern unsigned int compat_elf_hwcap, compat_elf_hwcap2; #endif |