From ba200d39adc830d2b71adcde65058593821169d8 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 8 Apr 2020 00:55:32 -0700 Subject: [PATCH] ANDROID: GKI: arm64: reserve space in cpu_hwcaps and cpu_hwcap_keys arrays Since cpu_hwcaps and cpu_hwcap_keys are exported symbols, reserve space in them for any future cpu capabilities or erratas. Bug: 151154716 Bug: 153490586 Signed-off-by: Mian Yousaf Kaukab Signed-off-by: Greg Kroah-Hartman Change-Id: I35930dd52d98817831d812f35560a2605804a553 (cherry picked from commit 9c406803119f6f1a86fe2d693e5dbe1e849c9d42) Signed-off-by: Will McVicker [willmcvicker: updated ARM64_NCAPS value to patch current range] --- arch/arm64/include/asm/cpucaps.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/cpucaps.h b/arch/arm64/include/asm/cpucaps.h index c3de0bbf0e9a..659e5a6257a7 100644 --- a/arch/arm64/include/asm/cpucaps.h +++ b/arch/arm64/include/asm/cpucaps.h @@ -54,6 +54,7 @@ #define ARM64_WORKAROUND_1463225 33 #define ARM64_SSBS 34 -#define ARM64_NCAPS 35 +/* kabi: reserve 35 - 62 for future cpu capabilities */ +#define ARM64_NCAPS 62 #endif /* __ASM_CPUCAPS_H */