arm64: cpufeature: Reduce number of pointer auth CPU caps from 6 to 4

[sfrench/cifs-2.6.git] / arch / arm64 / include / asm / cpufeature.h

diff --git a/arch/arm64/include/asm/cpufeature.h b/arch/arm64/include/asm/cpufeature.h
index daec4b50d7fb615218e19b94c8f2f5298e676742..1e7fcd12b1c13bd3f1bcb5bab00c352a4329d212 100644 (file)
--- a/arch/arm64/include/asm/cpufeature.h
+++ b/arch/arm64/include/asm/cpufeature.h
@@ -568,13 +568,15 @@ static inline bool system_supports_cnp(void)
 static inline bool system_supports_address_auth(void)
 {
        return IS_ENABLED(CONFIG_ARM64_PTR_AUTH) &&
-               cpus_have_const_cap(ARM64_HAS_ADDRESS_AUTH);
+               (cpus_have_const_cap(ARM64_HAS_ADDRESS_AUTH_ARCH) ||
+                cpus_have_const_cap(ARM64_HAS_ADDRESS_AUTH_IMP_DEF));
 }
 
 static inline bool system_supports_generic_auth(void)
 {
        return IS_ENABLED(CONFIG_ARM64_PTR_AUTH) &&
-               cpus_have_const_cap(ARM64_HAS_GENERIC_AUTH);
+               (cpus_have_const_cap(ARM64_HAS_GENERIC_AUTH_ARCH) ||
+                cpus_have_const_cap(ARM64_HAS_GENERIC_AUTH_IMP_DEF));
 }
 
 #define ARM64_SSBD_UNKNOWN             -1