diff options
| author | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-01-12 21:50:48 +0000 |
|---|---|---|
| committer | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-01-12 21:50:48 +0000 |
| commit | a8a2b9ee4bec0b29d031324160b7f11af42a563a (patch) | |
| tree | baf164b7da460973b2ec916d6a3f7b39d5b76d9a /virt | |
| parent | b598b85172f7df91090abe0f200f89a458ca4cc5 (diff) | |
| parent | a829146c3fdcf6d0b76d9c54556a223820f1f73b (diff) | |
Merge tag 'v5.4.89' into 5.4-2.3.x-imx
This is the 5.4.89 stable release
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.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 1dfa49d26de9..8f3b40ec02b7 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -428,9 +428,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); |