From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Mon, 18 Oct 2010 13:38:40 +0000 (+0200)
Subject: KVM: Drop CONFIG_DMAR dependency around kvm_iommu_map_pages
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5fb8b8b306bdd33c2180b9c6b41ba9aa33c5561a;p=users%2Fdwmw2%2Flinux.git

KVM: Drop CONFIG_DMAR dependency around kvm_iommu_map_pages

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>
---

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 5d57ec912eb2d..30fd81daf3304 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -708,14 +708,12 @@ skip_lpage:
 	if (r)
 		goto out_free;
 
-#ifdef CONFIG_DMAR
 	/* map the pages in iommu page table */
 	if (npages) {
 		r = kvm_iommu_map_pages(kvm, &new);
 		if (r)
 			goto out_free;
 	}
-#endif
 
 	r = -ENOMEM;
 	slots = kzalloc(sizeof(struct kvm_memslots), GFP_KERNEL);