Merge tag 'trace-v5.2-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

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

diff --git a/arch/arm64/include/asm/cpucaps.h b/arch/arm64/include/asm/cpucaps.h
index defdc67d9ab49c8542e42e79203db5a9df1b0754..33401ebc187cf6fad738e18dc8f4035fe609bb7d 100644 (file)
--- a/arch/arm64/include/asm/cpucaps.h
+++ b/arch/arm64/include/asm/cpucaps.h
@@ -53,7 +53,7 @@
 #define ARM64_HAS_STAGE2_FWB                   32
 #define ARM64_HAS_CRC32                                33
 #define ARM64_SSBS                             34
-#define ARM64_WORKAROUND_1188873               35
+#define ARM64_WORKAROUND_1418040               35
 #define ARM64_HAS_SB                           36
 #define ARM64_WORKAROUND_1165522               37
 #define ARM64_HAS_ADDRESS_AUTH_ARCH            38
@@ -62,7 +62,8 @@
 #define ARM64_HAS_GENERIC_AUTH_IMP_DEF         41
 #define ARM64_HAS_IRQ_PRIO_MASKING             42
 #define ARM64_HAS_DCPODP                       43
+#define ARM64_WORKAROUND_1463225               44
 
-#define ARM64_NCAPS                            44
+#define ARM64_NCAPS                            45
 
 #endif /* __ASM_CPUCAPS_H */