aboutsummaryrefslogtreecommitdiffstats
path: root/virt/kvm
diff options
context:
space:
mode:
Diffstat (limited to 'virt/kvm')
-rw-r--r--virt/kvm/iommu.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/virt/kvm/iommu.c b/virt/kvm/iommu.c
index 4e5f7b7f1d2b..0fb448e6a1a3 100644
--- a/virt/kvm/iommu.c
+++ b/virt/kvm/iommu.c
@@ -113,7 +113,7 @@ int kvm_iommu_map_pages(struct kvm *kvm, struct kvm_memory_slot *slot)
113 113
114 /* Map into IO address space */ 114 /* Map into IO address space */
115 r = iommu_map(domain, gfn_to_gpa(gfn), pfn_to_hpa(pfn), 115 r = iommu_map(domain, gfn_to_gpa(gfn), pfn_to_hpa(pfn),
116 get_order(page_size), flags); 116 page_size, flags);
117 if (r) { 117 if (r) {
118 printk(KERN_ERR "kvm_iommu_map_address:" 118 printk(KERN_ERR "kvm_iommu_map_address:"
119 "iommu failed to map pfn=%llx\n", pfn); 119 "iommu failed to map pfn=%llx\n", pfn);
@@ -293,15 +293,15 @@ static void kvm_iommu_put_pages(struct kvm *kvm,
293 293
294 while (gfn < end_gfn) { 294 while (gfn < end_gfn) {
295 unsigned long unmap_pages; 295 unsigned long unmap_pages;
296 int order; 296 size_t size;
297 297
298 /* Get physical address */ 298 /* Get physical address */
299 phys = iommu_iova_to_phys(domain, gfn_to_gpa(gfn)); 299 phys = iommu_iova_to_phys(domain, gfn_to_gpa(gfn));
300 pfn = phys >> PAGE_SHIFT; 300 pfn = phys >> PAGE_SHIFT;
301 301
302 /* Unmap address from IO address space */ 302 /* Unmap address from IO address space */
303 order = iommu_unmap(domain, gfn_to_gpa(gfn), 0); 303 size = iommu_unmap(domain, gfn_to_gpa(gfn), PAGE_SIZE);
304 unmap_pages = 1ULL << order; 304 unmap_pages = 1ULL << get_order(size);
305 305
306 /* Unpin all pages we just unmapped to not leak any memory */ 306 /* Unpin all pages we just unmapped to not leak any memory */
307 kvm_unpin_pages(kvm, pfn, unmap_pages); 307 kvm_unpin_pages(kvm, pfn, unmap_pages);