1 files changed, 9 insertions, 3 deletions

diff --git a/virt/kvm/iommu.c b/virt/kvm/iommu.c
index 96048ee9e39e..62a9caf0563c 100644
--- a/virt/kvm/iommu.c
+++ b/virt/kvm/iommu.c
@@ -16,6 +16,8 @@
  *
  * Copyright (C) 2006-2008 Intel Corporation
  * Copyright IBM Corporation, 2008
+ * Copyright 2010 Red Hat, Inc. and/or its affiliates.
+ *
  * Author: Allen M. Kay <allen.m.kay@intel.com>
  * Author: Weidong Han <weidong.han@intel.com>
  * Author: Ben-Ami Yassour <benami@il.ibm.com>
@@ -106,7 +108,7 @@ int kvm_iommu_map_pages(struct kvm *kvm, struct kvm_memory_slot *slot)
                               get_order(page_size), flags);
                 if (r) {
                         printk(KERN_ERR "kvm_iommu_map_address:"
-                               "iommu failed to map pfn=%lx\n", pfn);
+                               "iommu failed to map pfn=%llx\n", pfn);
                         goto unmap_pages;
                 }
 
@@ -124,9 +126,10 @@ unmap_pages:
 
 static int kvm_iommu_map_memslots(struct kvm *kvm)
 {
-        int i, r = 0;
+        int i, idx, r = 0;
         struct kvm_memslots *slots;
 
+        idx = srcu_read_lock(&kvm->srcu);
         slots = kvm_memslots(kvm);
 
         for (i = 0; i < slots->nmemslots; i++) {
@@ -134,6 +137,7 @@ static int kvm_iommu_map_memslots(struct kvm *kvm)
                 if (r)
                         break;
         }
+        srcu_read_unlock(&kvm->srcu, idx);
 
         return r;
 }
@@ -283,15 +287,17 @@ static void kvm_iommu_put_pages(struct kvm *kvm,
 
 static int kvm_iommu_unmap_memslots(struct kvm *kvm)
 {
-        int i;
+        int i, idx;
         struct kvm_memslots *slots;
 
+        idx = srcu_read_lock(&kvm->srcu);
         slots = kvm_memslots(kvm);
 
         for (i = 0; i < slots->nmemslots; i++) {
                 kvm_iommu_put_pages(kvm, slots->memslots[i].base_gfn,
                                     slots->memslots[i].npages);
         }
+        srcu_read_unlock(&kvm->srcu, idx);
 
         return 0;
 }