Merge branch 'for-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

[sfrench/cifs-2.6.git] / arch / mips / kvm / vz.c

diff --git a/arch/mips/kvm/vz.c b/arch/mips/kvm/vz.c
index 74805035edc892f42f23ff1584f1fb9b6ef79777..dde20887a70dfc643c5bb1005599055d019e2eb5 100644 (file)
--- a/arch/mips/kvm/vz.c
+++ b/arch/mips/kvm/vz.c
@@ -2454,10 +2454,10 @@ static void kvm_vz_vcpu_load_tlb(struct kvm_vcpu *vcpu, int cpu)
                 * Root ASID dealiases guest GPA mappings in the root TLB.
                 * Allocate new root ASID if needed.
                 */
-               if (cpumask_test_and_clear_cpu(cpu, &kvm->arch.asid_flush_mask)
-                   || (cpu_context(cpu, gpa_mm) ^ asid_cache(cpu)) &
-                                               asid_version_mask(cpu))
-                       get_new_mmu_context(gpa_mm, cpu);
+               if (cpumask_test_and_clear_cpu(cpu, &kvm->arch.asid_flush_mask))
+                       get_new_mmu_context(gpa_mm);
+               else
+                       check_mmu_context(gpa_mm);
        }
 }