diff options
| author |   Paolo Bonzini <pbonzini@redhat.com> | 2016-06-30 17:11:20 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-06-30 17:11:20 +0200 |
| commit | f5c5c225fce4cb98fe4451d4c4d654e3f18b9f82 (patch) | |
| tree | dc81d86b30c035f23e8fc4712bf16804af7ccc12 /arch | |
| parent | KVM: nVMX: VMX instructions: fix segment checks when L1 is in long mode. (diff) | |
| parent | KVM: arm/arm64: Stop leaking vcpu pid references (diff) | |
| download | linux-dev-f5c5c225fce4cb98fe4451d4c4d654e3f18b9f82.tar.xz linux-dev-f5c5c225fce4cb98fe4451d4c4d654e3f18b9f82.zip | |
Merge tag 'kvm-arm-for-v4.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master
KVM/ARM Fixes for v4.7-rc6:
Fixes a build issue without CONFIG_ARM_PMU and plugs pid leak on arm/arm64.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/kvm/arm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c index 893941ec98dc..f1bde7c4e736 100644 --- a/arch/arm/kvm/arm.c +++ b/arch/arm/kvm/arm.c @@ -263,6 +263,7 @@ void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu) kvm_timer_vcpu_terminate(vcpu); kvm_vgic_vcpu_destroy(vcpu); kvm_pmu_vcpu_destroy(vcpu); + kvm_vcpu_uninit(vcpu); kmem_cache_free(kvm_vcpu_cache, vcpu); } |