diff options
| author |   David S. Miller <davem@davemloft.net> | 2017-11-10 10:00:18 +0900 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-10 10:00:18 +0900 |
| commit | 4dc6758d7824a6d25717ccceefc488cafdb07210 (patch) | |
| tree | 992e5d5996910af35a5c12fe94da14d0bb167452 /arch/x86/kvm/vmx.c | |
| parent | Merge branch 'dsa-setup-stage' (diff) | |
| parent | Merge tag 'pm-final-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (diff) | |
| download | linux-dev-4dc6758d7824a6d25717ccceefc488cafdb07210.tar.xz linux-dev-4dc6758d7824a6d25717ccceefc488cafdb07210.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Simple cases of overlapping changes in the packet scheduler.
Must easier to resolve this time.
Which probably means that I screwed it up somehow.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/x86/kvm/vmx.c')
| -rw-r--r-- | arch/x86/kvm/vmx.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 95a01609d7ee..a6f4f095f8f4 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -5619,9 +5619,6 @@ static void vmx_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event) kvm_make_request(KVM_REQ_APIC_PAGE_RELOAD, vcpu); - if (kvm_vcpu_apicv_active(vcpu)) - memset(&vmx->pi_desc, 0, sizeof(struct pi_desc)); - if (vmx->vpid != 0) vmcs_write16(VIRTUAL_PROCESSOR_ID, vmx->vpid); |