author: Wanpeng Li <wanpengli@tencent.com> 2021-05-18 05:00:31 -0700
committer: Paolo Bonzini <pbonzini@redhat.com> 2021-05-27 07:45:50 -0400
commit: 6bd5b743686243dae7351d5dcceeb7f171201bb4
parent: 28a4aa1160d71187a44414dac40b57d1fd9fcd77
Commit Summary:
Diffstat:
1 file changed, 1 insertion, 2 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 6b4feb92dc79..5f40725144f5 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -2973,8 +2973,7 @@ void kvm_vcpu_block(struct kvm_vcpu *vcpu)
goto out;
}
poll_end = cur = ktime_get();
- } while (single_task_running() && !need_resched() &&
- ktime_before(cur, stop));
+ } while (kvm_vcpu_can_poll(cur, stop));
}
prepare_to_rcuwait(&vcpu->wait);