diff options
Diffstat (limited to 'virt')
-rw-r--r-- | virt/kvm/kvm_main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index a1a4272fa57c..63d5fa2bc84a 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c | |||
@@ -1610,7 +1610,8 @@ void kvm_vcpu_block(struct kvm_vcpu *vcpu) | |||
1610 | for (;;) { | 1610 | for (;;) { |
1611 | prepare_to_wait(&vcpu->wq, &wait, TASK_INTERRUPTIBLE); | 1611 | prepare_to_wait(&vcpu->wq, &wait, TASK_INTERRUPTIBLE); |
1612 | 1612 | ||
1613 | if (kvm_cpu_has_interrupt(vcpu) || | 1613 | if ((kvm_arch_interrupt_allowed(vcpu) && |
1614 | kvm_cpu_has_interrupt(vcpu)) || | ||
1614 | kvm_arch_vcpu_runnable(vcpu)) { | 1615 | kvm_arch_vcpu_runnable(vcpu)) { |
1615 | set_bit(KVM_REQ_UNHALT, &vcpu->requests); | 1616 | set_bit(KVM_REQ_UNHALT, &vcpu->requests); |
1616 | break; | 1617 | break; |