Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszer...

[sfrench/cifs-2.6.git] / arch / arm / kvm / handle_exit.c

diff --git a/arch/arm/kvm/handle_exit.c b/arch/arm/kvm/handle_exit.c
index f86a9aaef462c6d861a80ae60bb26492ddb28d66..54442e3753542e342d8ba8b2c227ec4f31910175 100644 (file)
--- a/arch/arm/kvm/handle_exit.c
+++ b/arch/arm/kvm/handle_exit.c
@@ -72,6 +72,7 @@ static int kvm_handle_wfx(struct kvm_vcpu *vcpu, struct kvm_run *run)
                trace_kvm_wfx(*vcpu_pc(vcpu), false);
                vcpu->stat.wfi_exit_stat++;
                kvm_vcpu_block(vcpu);
+               kvm_clear_request(KVM_REQ_UNHALT, vcpu);
        }
 
        kvm_skip_instr(vcpu, kvm_vcpu_trap_il_is32bit(vcpu));