diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2012-05-21 21:17:50 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2012-05-21 21:17:50 +0200 |
| commit | d13a822e6d08733cc69dd8c2f5d82eacb1474295 (patch) | |
| tree | 2b39613c0d8cce9eb3b15adb1525a2c72f46d392 /arch/x86/kvm/x86.c | |
| parent | x86, printk: Add missing KERN_CONT to NMI selftest (diff) | |
| parent | Linux 3.4 (diff) | |
| download | linux-d13a822e6d08733cc69dd8c2f5d82eacb1474295.tar.xz linux-d13a822e6d08733cc69dd8c2f5d82eacb1474295.zip | |
Merge commit 'v3.4' into x86/urgent
Diffstat (limited to 'arch/x86/kvm/x86.c')
| -rw-r--r-- | arch/x86/kvm/x86.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 91a5e989abcf..185a2b823a2d 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -6581,6 +6581,7 @@ void kvm_arch_async_page_present(struct kvm_vcpu *vcpu, kvm_inject_page_fault(vcpu, &fault); } vcpu->arch.apf.halted = false; + vcpu->arch.mp_state = KVM_MP_STATE_RUNNABLE; } bool kvm_arch_can_inject_async_page_present(struct kvm_vcpu *vcpu) |