Merge tag 'kvmarm-fixes-5.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmar...

[tomoyo/tomoyo-test1.git] / arch / arm64 / include / asm / kvm_hyp.h

diff --git a/arch/arm64/include/asm/kvm_hyp.h b/arch/arm64/include/asm/kvm_hyp.h
index 5fde137..fe57f60 100644 (file)
--- a/arch/arm64/include/asm/kvm_hyp.h
+++ b/arch/arm64/include/asm/kvm_hyp.h
@@ -98,11 +98,11 @@ static __always_inline void __hyp_text __load_guest_stage2(struct kvm *kvm)
        write_sysreg(kvm_get_vttbr(kvm), vttbr_el2);
 
        /*
-        * ARM erratum 1165522 requires the actual execution of the above
-        * before we can switch to the EL1/EL0 translation regime used by
+        * ARM errata 1165522 and 1530923 require the actual execution of the
+        * above before we can switch to the EL1/EL0 translation regime used by
         * the guest.
         */
-       asm(ALTERNATIVE("nop", "isb", ARM64_WORKAROUND_1165522));
+       asm(ALTERNATIVE("nop", "isb", ARM64_WORKAROUND_SPECULATIVE_AT_VHE));
 }
 
 #endif /* __ARM64_KVM_HYP_H__ */