diff options
Diffstat (limited to 'virt')
-rw-r--r-- | virt/kvm/kvm_main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index de3b029f6adf..63e661be040a 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c | |||
@@ -980,12 +980,12 @@ void kvm_vcpu_block(struct kvm_vcpu *vcpu) | |||
980 | for (;;) { | 980 | for (;;) { |
981 | prepare_to_wait(&vcpu->wq, &wait, TASK_INTERRUPTIBLE); | 981 | prepare_to_wait(&vcpu->wq, &wait, TASK_INTERRUPTIBLE); |
982 | 982 | ||
983 | if (kvm_cpu_has_interrupt(vcpu)) | 983 | if (kvm_cpu_has_interrupt(vcpu) || |
984 | break; | 984 | kvm_cpu_has_pending_timer(vcpu) || |
985 | if (kvm_cpu_has_pending_timer(vcpu)) | 985 | kvm_arch_vcpu_runnable(vcpu)) { |
986 | break; | 986 | set_bit(KVM_REQ_UNHALT, &vcpu->requests); |
987 | if (kvm_arch_vcpu_runnable(vcpu)) | ||
988 | break; | 987 | break; |
988 | } | ||
989 | if (signal_pending(current)) | 989 | if (signal_pending(current)) |
990 | break; | 990 | break; |
991 | 991 | ||