diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-10 10:53:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-10 10:53:14 -0700 |
| commit | 7908a9e5fc3f9a679b1777ed231a03636c068446 (patch) | |
| tree | 8d11c58a2b2550095f0945547e520062466b69f0 /arch/ia64/kvm/kvm-ia64.c | |
| parent | 8fade6aff706b2ae3f02864b4023d34b002cd226 (diff) | |
| parent | 07dc7263b99e4ddad2b4c69765a428ccb7d48938 (diff) | |
| download | kernel_samsung_smdk4412-7908a9e5fc3f9a679b1777ed231a03636c068446.tar.gz kernel_samsung_smdk4412-7908a9e5fc3f9a679b1777ed231a03636c068446.tar.bz2 kernel_samsung_smdk4412-7908a9e5fc3f9a679b1777ed231a03636c068446.zip | |
Merge branch 'kvm-updates/2.6.35' of git://git.kernel.org/pub/scm/virt/kvm/kvm
* 'kvm-updates/2.6.35' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: read apic->irr with ioapic lock held
KVM: ia64: Add missing spin_unlock in kvm_arch_hardware_enable()
KVM: Fix order passed to iommu_unmap
KVM: MMU: Remove user access when allowing kernel access to gpte.w=0 page
KVM: MMU: invalidate and flush on spte small->large page size change
KVM: SVM: Implement workaround for Erratum 383
KVM: SVM: Handle MCEs early in the vmexit process
KVM: powerpc: fix init/exit annotation
Diffstat (limited to 'arch/ia64/kvm/kvm-ia64.c')
| -rw-r--r-- | arch/ia64/kvm/kvm-ia64.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c index d5f4e916120..21b701374f7 100644 --- a/arch/ia64/kvm/kvm-ia64.c +++ b/arch/ia64/kvm/kvm-ia64.c @@ -144,6 +144,7 @@ int kvm_arch_hardware_enable(void *garbage) VP_INIT_ENV : VP_INIT_ENV_INITALIZE, __pa(kvm_vm_buffer), KVM_VM_BUFFER_BASE, &tmp_base); if (status != 0) { + spin_unlock(&vp_lock); printk(KERN_WARNING"kvm: Failed to Enable VT Support!!!!\n"); return -EINVAL; } |