summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2016-06-30 17:11:20 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2016-06-30 17:11:20 +0200
commitf5c5c225fce4cb98fe4451d4c4d654e3f18b9f82 (patch)
treedc81d86b30c035f23e8fc4712bf16804af7ccc12 /arch
parentff30ef40deca4658e27b0c596e7baf39115e858f (diff)
parent591d215afcc2f94e8e2c69a63c924c044677eb31 (diff)
downloadlinux-f5c5c225fce4cb98fe4451d4c4d654e3f18b9f82.tar.gz
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.c1
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);
}