From a56005d3210500f8a166fcb83cbb5ac5d0f909e4 Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Wed, 12 Dec 2018 15:52:02 +0000 Subject: arm64: cpufeature: Reduce number of pointer auth CPU caps from 6 to 4 We can easily avoid defining the two meta-capabilities for the address and generic keys, so remove them and instead just check both of the architected and impdef capabilities when determining the level of system support. Reviewed-by: Suzuki Poulose Signed-off-by: Will Deacon --- arch/arm64/include/asm/cpucaps.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'arch/arm64/include/asm/cpucaps.h') diff --git a/arch/arm64/include/asm/cpucaps.h b/arch/arm64/include/asm/cpucaps.h index 803f388e81d4..82e9099834ae 100644 --- a/arch/arm64/include/asm/cpucaps.h +++ b/arch/arm64/include/asm/cpucaps.h @@ -58,11 +58,9 @@ #define ARM64_WORKAROUND_1165522 37 #define ARM64_HAS_ADDRESS_AUTH_ARCH 38 #define ARM64_HAS_ADDRESS_AUTH_IMP_DEF 39 -#define ARM64_HAS_ADDRESS_AUTH 40 -#define ARM64_HAS_GENERIC_AUTH_ARCH 41 -#define ARM64_HAS_GENERIC_AUTH_IMP_DEF 42 -#define ARM64_HAS_GENERIC_AUTH 43 +#define ARM64_HAS_GENERIC_AUTH_ARCH 40 +#define ARM64_HAS_GENERIC_AUTH_IMP_DEF 41 -#define ARM64_NCAPS 44 +#define ARM64_NCAPS 42 #endif /* __ASM_CPUCAPS_H */ -- cgit v1.2.3-55-g7522