---

yaml --- r: 215931 b: refs/heads/master c: 2a31339 h: refs/heads/master i: 215929: 54312a8 215927: 09120f8 v: v3
git-mirror · Oct 24, 2010 · 8b03599 · 8b03599
1 parent b4eeb1b
commit 8b03599
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7a79b6c80fdbe4366484805ee07a4735fc427d8
+refs/heads/master: 2a31339aa014c0d0b97c57d3ebc997732f8f47fc
diff --git a/trunk/virt/kvm/kvm_main.c b/trunk/virt/kvm/kvm_main.c
@@ -705,14 +705,12 @@ int __kvm_set_memory_region(struct kvm *kvm,
 	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);