Messages in this thread | | | Date | Wed, 27 Jan 2010 12:57:30 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the kvm tree with Linus' tree |
| |
Hi all,
Today's linux-next merge of the kvm tree got a conflict in arch/x86/kvm/x86.c between commit 36cb93fd6b6bf7e9163a69a8bf20207aed5fea44 ("KVM: x86: Fix probable memory leak of vcpu->arch.mce_banks") from Linus' tree and commit kvm_arch_vcpu_uninit ("KVM: switch vcpu context to use SRCU") from the kvm tree.
I fixed it up (I think ... see below) and can carry the fix for a while. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/x86/kvm/x86.c index 1ddcad4,a311751..0000000 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@@ -5089,11 -5468,12 +5469,13 @@@ fail void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu) { + int idx; + + kfree(vcpu->arch.mce_banks); kvm_free_lapic(vcpu); - down_read(&vcpu->kvm->slots_lock); + idx = srcu_read_lock(&vcpu->kvm->srcu); kvm_mmu_destroy(vcpu); - up_read(&vcpu->kvm->slots_lock); + srcu_read_unlock(&vcpu->kvm->srcu, idx); free_page((unsigned long)vcpu->arch.pio_data); }
| |