summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2010-10-05 14:22:41 -0500
committerMarcelo Tosatti <mtosatti@redhat.com>2010-11-05 14:42:28 -0200
commitf22e2f049d4643ed3c2d498ca50f894ace87962b (patch)
tree76ea2e8eb9ba6d4f9de97ddf232039ec629cc958
parenta36be1003a80197714fc2b6e198df2f31f9eb270 (diff)
downloadlinux-3.10-f22e2f049d4643ed3c2d498ca50f894ace87962b.tar.gz
linux-3.10-f22e2f049d4643ed3c2d498ca50f894ace87962b.tar.bz2
linux-3.10-f22e2f049d4643ed3c2d498ca50f894ace87962b.zip
KVM: PPC: e500: Call kvm_vcpu_uninit() before kvmppc_e500_tlb_uninit().
The VCPU uninit calls some TLB functions, and the TLB uninit function frees the memory used by them. Signed-off-by: Scott Wood <scottwood@freescale.com> Acked-by: Liu Yu <yu.liu@freescale.com> Signed-off-by: Alexander Graf <agraf@suse.de>
-rw-r--r--arch/powerpc/kvm/e500.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kvm/e500.c b/arch/powerpc/kvm/e500.c
index 71750f2dd5d..e3768ee9b59 100644
--- a/arch/powerpc/kvm/e500.c
+++ b/arch/powerpc/kvm/e500.c
@@ -138,8 +138,8 @@ void kvmppc_core_vcpu_free(struct kvm_vcpu *vcpu)
struct kvmppc_vcpu_e500 *vcpu_e500 = to_e500(vcpu);
free_page((unsigned long)vcpu->arch.shared);
- kvmppc_e500_tlb_uninit(vcpu_e500);
kvm_vcpu_uninit(vcpu);
+ kvmppc_e500_tlb_uninit(vcpu_e500);
kmem_cache_free(kvm_vcpu_cache, vcpu_e500);
}