Merge branch 'for-next/bti-user' into for-next/bti

[linux-2.6-microblaze.git] / arch / arm64 / include / asm / cpucaps.h

diff --git a/arch/arm64/include/asm/cpucaps.h b/arch/arm64/include/asm/cpucaps.h
index 58e776c..7b60514 100644 (file)
--- a/arch/arm64/include/asm/cpucaps.h
+++ b/arch/arm64/include/asm/cpucaps.h
@@ -58,8 +58,11 @@
 #define ARM64_WORKAROUND_SPECULATIVE_AT_NVHE   48
 #define ARM64_HAS_E0PD                         49
 #define ARM64_HAS_RNG                          50
-#define ARM64_BTI                              51
+#define ARM64_HAS_AMU_EXTN                     51
+#define ARM64_HAS_ADDRESS_AUTH                 52
+#define ARM64_HAS_GENERIC_AUTH                 53
+#define ARM64_BTI                              54
 
-#define ARM64_NCAPS                            52
+#define ARM64_NCAPS                            55
 
 #endif /* __ASM_CPUCAPS_H */