diff options
| author | Stafford Horne <shorne@gmail.com> | 2021-01-25 11:08:34 +0900 |
|---|---|---|
| committer | Stafford Horne <shorne@gmail.com> | 2021-01-25 11:16:06 +0900 |
| commit | 2261352157a932717ec08b9dd18d1bfbb7c37c52 (patch) | |
| tree | b48a3ea4060a7d078aecb97de07597a8eb24467a /virt | |
| parent | 3706f9f76a4f79f8e7b2eb8b99877e89fe9ad732 (diff) | |
| parent | 031c7a8cd6fc565e90320bf08f22ee6e70f9d969 (diff) | |
Merge remote-tracking branch 'openrisc/or1k-5.11-fixes' into or1k-5.12-updates
Pickup fixes that went upstream already in order to resolve conflicts in
litex_soc_ctrl.c between 5.11 fixes that went upstream and the
or1k-5.12-updates linux-next queue.
Signed-off-by: Stafford Horne <shorne@gmail.com>
Diffstat (limited to 'virt')
| -rw-r--r-- | virt/kvm/kvm_main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 5f260488e999..fa9e3614d30e 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -485,9 +485,8 @@ static int kvm_mmu_notifier_invalidate_range_start(struct mmu_notifier *mn, kvm->mmu_notifier_count++; need_tlb_flush = kvm_unmap_hva_range(kvm, range->start, range->end, range->flags); - need_tlb_flush |= kvm->tlbs_dirty; /* we've to flush the tlb before the pages can be freed */ - if (need_tlb_flush) + if (need_tlb_flush || kvm->tlbs_dirty) kvm_flush_remote_tlbs(kvm); spin_unlock(&kvm->mmu_lock); |