Merge tag 'kvm-4.15-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[sfrench/cifs-2.6.git] / arch / x86 / kvm / mmu.c

diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 0b481cc9c72533d5eb5f9f43856d05354f39f880..e5e66e5c664057bb5cc5ad2660008ccbf19b69e5 100644 (file)
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -457,7 +457,7 @@ static u64 __update_clear_spte_slow(u64 *sptep, u64 spte)
 
 static u64 __get_spte_lockless(u64 *sptep)
 {
-       return ACCESS_ONCE(*sptep);
+       return READ_ONCE(*sptep);
 }
 #else
 union split_spte {
@@ -4815,7 +4815,7 @@ static void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,
         * If we don't have indirect shadow pages, it means no page is
         * write-protected, so we can exit simply.
         */
-       if (!ACCESS_ONCE(vcpu->kvm->arch.indirect_shadow_pages))
+       if (!READ_ONCE(vcpu->kvm->arch.indirect_shadow_pages))
                return;
 
        remote_flush = local_flush = false;