[PATCH v6 09/19] arm64:ilp32: share HWCAP between LP64 and ILP32
STALE3954d
REVIEWED: 1 (0M)
From: Yury Norov <hidden>
Date: 2015-11-17 21:20:00
Also in:
lkml
Subsystem:
arm64 port (aarch64 architecture), the rest · Maintainers:
Catalin Marinas, Will Deacon, Linus Torvalds
Revision v6 of 15 in this series; 1 review trailer.
Revisions (15)
- v5 [diff vs current]
- v6 [diff vs current]
- v6 current
- v6 [diff vs current]
- v6 [diff vs current]
- v6 [diff vs current]
- v6 [diff vs current]
- v6 [diff vs current]
- v7 [diff vs current]
- v7 [diff vs current]
- v7 [diff vs current]
- v7 [diff vs current]
- v7 [diff vs current]
- v8 [diff vs current]
- v9 [diff vs current]
From: Andrew Pinski <redacted> Reviewed-by: David Daney <redacted> Signed-off-by: Philipp Tomsich <redacted> Signed-off-by: Christoph Muellner <redacted> Signed-off-by: Yury Norov <redacted> Signed-off-by: Andrew Pinski <redacted> --- arch/arm64/include/asm/hwcap.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/include/asm/hwcap.h b/arch/arm64/include/asm/hwcap.h
index 0ad7351..1e5361e 100644
--- a/arch/arm64/include/asm/hwcap.h
+++ b/arch/arm64/include/asm/hwcap.h@@ -47,9 +47,17 @@ #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; +#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) + #endif extern unsigned long elf_hwcap;
--
2.1.4