Merge tag 'kvmarm-for-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm...

[sfrench/cifs-2.6.git] / arch / arm / include / asm / kvm_emulate.h

diff --git a/arch/arm/include/asm/kvm_emulate.h b/arch/arm/include/asm/kvm_emulate.h
index 2b7eed21b20e3de94b31e8a0f4f9effe73df97ac..77121b713bef3adbc4b2c77c559dab1886dec96b 100644 (file)
--- a/arch/arm/include/asm/kvm_emulate.h
+++ b/arch/arm/include/asm/kvm_emulate.h
@@ -26,13 +26,13 @@
 #include <asm/cputype.h>
 
 /* arm64 compatibility macros */
-#define COMPAT_PSR_MODE_ABT    ABT_MODE
-#define COMPAT_PSR_MODE_UND    UND_MODE
-#define COMPAT_PSR_T_BIT       PSR_T_BIT
-#define COMPAT_PSR_I_BIT       PSR_I_BIT
-#define COMPAT_PSR_A_BIT       PSR_A_BIT
-#define COMPAT_PSR_E_BIT       PSR_E_BIT
-#define COMPAT_PSR_IT_MASK     PSR_IT_MASK
+#define PSR_AA32_MODE_ABT      ABT_MODE
+#define PSR_AA32_MODE_UND      UND_MODE
+#define PSR_AA32_T_BIT         PSR_T_BIT
+#define PSR_AA32_I_BIT         PSR_I_BIT
+#define PSR_AA32_A_BIT         PSR_A_BIT
+#define PSR_AA32_E_BIT         PSR_E_BIT
+#define PSR_AA32_IT_MASK       PSR_IT_MASK
 
 unsigned long *vcpu_reg(struct kvm_vcpu *vcpu, u8 reg_num);