diff options
Diffstat (limited to 'arch/x86/kvm/iommu.c')
-rw-r--r-- | arch/x86/kvm/iommu.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/x86/kvm/iommu.c b/arch/x86/kvm/iommu.c index 5c520ebf6343..a22a488b4622 100644 --- a/arch/x86/kvm/iommu.c +++ b/arch/x86/kvm/iommu.c | |||
@@ -43,11 +43,11 @@ static int kvm_iommu_unmap_memslots(struct kvm *kvm); | |||
43 | static void kvm_iommu_put_pages(struct kvm *kvm, | 43 | static void kvm_iommu_put_pages(struct kvm *kvm, |
44 | gfn_t base_gfn, unsigned long npages); | 44 | gfn_t base_gfn, unsigned long npages); |
45 | 45 | ||
46 | static pfn_t kvm_pin_pages(struct kvm_memory_slot *slot, gfn_t gfn, | 46 | static kvm_pfn_t kvm_pin_pages(struct kvm_memory_slot *slot, gfn_t gfn, |
47 | unsigned long npages) | 47 | unsigned long npages) |
48 | { | 48 | { |
49 | gfn_t end_gfn; | 49 | gfn_t end_gfn; |
50 | pfn_t pfn; | 50 | kvm_pfn_t pfn; |
51 | 51 | ||
52 | pfn = gfn_to_pfn_memslot(slot, gfn); | 52 | pfn = gfn_to_pfn_memslot(slot, gfn); |
53 | end_gfn = gfn + npages; | 53 | end_gfn = gfn + npages; |
@@ -62,7 +62,8 @@ static pfn_t kvm_pin_pages(struct kvm_memory_slot *slot, gfn_t gfn, | |||
62 | return pfn; | 62 | return pfn; |
63 | } | 63 | } |
64 | 64 | ||
65 | static void kvm_unpin_pages(struct kvm *kvm, pfn_t pfn, unsigned long npages) | 65 | static void kvm_unpin_pages(struct kvm *kvm, kvm_pfn_t pfn, |
66 | unsigned long npages) | ||
66 | { | 67 | { |
67 | unsigned long i; | 68 | unsigned long i; |
68 | 69 | ||
@@ -73,7 +74,7 @@ static void kvm_unpin_pages(struct kvm *kvm, pfn_t pfn, unsigned long npages) | |||
73 | int kvm_iommu_map_pages(struct kvm *kvm, struct kvm_memory_slot *slot) | 74 | int kvm_iommu_map_pages(struct kvm *kvm, struct kvm_memory_slot *slot) |
74 | { | 75 | { |
75 | gfn_t gfn, end_gfn; | 76 | gfn_t gfn, end_gfn; |
76 | pfn_t pfn; | 77 | kvm_pfn_t pfn; |
77 | int r = 0; | 78 | int r = 0; |
78 | struct iommu_domain *domain = kvm->arch.iommu_domain; | 79 | struct iommu_domain *domain = kvm->arch.iommu_domain; |
79 | int flags; | 80 | int flags; |
@@ -275,7 +276,7 @@ static void kvm_iommu_put_pages(struct kvm *kvm, | |||
275 | { | 276 | { |
276 | struct iommu_domain *domain; | 277 | struct iommu_domain *domain; |
277 | gfn_t end_gfn, gfn; | 278 | gfn_t end_gfn, gfn; |
278 | pfn_t pfn; | 279 | kvm_pfn_t pfn; |
279 | u64 phys; | 280 | u64 phys; |
280 | 281 | ||
281 | domain = kvm->arch.iommu_domain; | 282 | domain = kvm->arch.iommu_domain; |