From 8b03599b38e172ab1c534a42179354e7f27834b4 Mon Sep 17 00:00:00 2001
From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Mon, 18 Oct 2010 15:38:40 +0200
Subject: [PATCH] --- yaml --- r: 215931 b: refs/heads/master c:
 2a31339aa014c0d0b97c57d3ebc997732f8f47fc h: refs/heads/master i:   215929:
 54312a8d37210903b0f43ac42a4feb7b054bd794   215927:
 09120f8c4c30290efcd52b4eb2ece3d0c28b8d63 v: v3

---
 [refs]                    | 2 +-
 trunk/virt/kvm/kvm_main.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 38fd542f9785..cee5cf69f67a 100644
--- 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
index 1aeeb7fbe2ef..ac326de43ce4 100644
--- 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);