Merge branches 'for-next/gcs', 'for-next/probes', 'for-next/asm-offsets', 'for-next...

[linux.git] / arch / arm64 / include / asm / hwcap.h

diff --git a/arch/arm64/include/asm/hwcap.h b/arch/arm64/include/asm/hwcap.h
index a775adddecf25633e87d58fb9ac9e6293beac1b3..2b6c61c608e2cd107503b09aba5aaeab639b759a 100644 (file)
--- a/arch/arm64/include/asm/hwcap.h
+++ b/arch/arm64/include/asm/hwcap.h
@@ -92,6 +92,7 @@
 #define KERNEL_HWCAP_SB                        __khwcap_feature(SB)
 #define KERNEL_HWCAP_PACA              __khwcap_feature(PACA)
 #define KERNEL_HWCAP_PACG              __khwcap_feature(PACG)
+#define KERNEL_HWCAP_GCS               __khwcap_feature(GCS)
 
 #define __khwcap2_feature(x)           (const_ilog2(HWCAP2_ ## x) + 64)
 #define KERNEL_HWCAP_DCPODP            __khwcap2_feature(DCPODP)
@@ -159,17 +160,21 @@
 #define KERNEL_HWCAP_SME_SF8DP2                __khwcap2_feature(SME_SF8DP2)
 #define KERNEL_HWCAP_POE               __khwcap2_feature(POE)
 
+#define __khwcap3_feature(x)           (const_ilog2(HWCAP3_ ## x) + 128)
+
 /*
  * This yields a mask that user programs can use to figure out what
  * instruction set this cpu supports.
  */
 #define ELF_HWCAP              cpu_get_elf_hwcap()
 #define ELF_HWCAP2             cpu_get_elf_hwcap2()
+#define ELF_HWCAP3             cpu_get_elf_hwcap3()
 
 #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_HWCAP3      (compat_elf_hwcap3)
+extern unsigned int compat_elf_hwcap, compat_elf_hwcap2, compat_elf_hwcap3;
 #endif
 
 enum {