Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

KVM: Drop CONFIG_DMAR dependency around kvm_iommu_map_pages

Browse source 
We also have to call kvm_iommu_map_pages for CONFIG_AMD_IOMMU. So drop
the dependency on Intel IOMMU, kvm_iommu_map_pages will be a nop anyway
if CONFIG_IOMMU_API is not defined.

KVM-Stable-Tag.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
This commit is contained in:
Jan Kiszka 2010-10-18 15:38:40 +02:00 committed by Avi Kivity
parent d7a79b6c80
commit 2a31339aa0
1 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
virt/kvm/kvm_main.c
View file

@ -705,14 +705,12 @@ skip_lpage:
if (r) if (r)
goto out_free; goto out_free;
#ifdef CONFIG_DMAR
/* map the pages in iommu page table */ /* map the pages in iommu page table */
if (npages) { if (npages) {
r = kvm_iommu_map_pages(kvm, &new); r = kvm_iommu_map_pages(kvm, &new);
if (r) if (r)
goto out_free; goto out_free;
} }
#endif
r = -ENOMEM; r = -ENOMEM;
slots = kzalloc(sizeof(struct kvm_memslots), GFP_KERNEL); slots = kzalloc(sizeof(struct kvm_memslots), GFP_KERNEL);