mm/memremap_pages: convert to 'struct range'

[linux.git] / arch / powerpc / kvm / book3s_hv_uvmem.c

diff --git a/arch/powerpc/kvm/book3s_hv_uvmem.c b/arch/powerpc/kvm/book3s_hv_uvmem.c
index 7705d55572395bee32c798da5602d387a114a813..29ec555055c262bf39e5cd250ba0652798165755 100644 (file)
--- a/arch/powerpc/kvm/book3s_hv_uvmem.c
+++ b/arch/powerpc/kvm/book3s_hv_uvmem.c
@@ -687,9 +687,9 @@ static struct page *kvmppc_uvmem_get_page(unsigned long gpa, struct kvm *kvm)
        struct kvmppc_uvmem_page_pvt *pvt;
        unsigned long pfn_last, pfn_first;
 
-       pfn_first = kvmppc_uvmem_pgmap.res.start >> PAGE_SHIFT;
+       pfn_first = kvmppc_uvmem_pgmap.range.start >> PAGE_SHIFT;
        pfn_last = pfn_first +
-                  (resource_size(&kvmppc_uvmem_pgmap.res) >> PAGE_SHIFT);
+                  (range_len(&kvmppc_uvmem_pgmap.range) >> PAGE_SHIFT);
 
        spin_lock(&kvmppc_uvmem_bitmap_lock);
        bit = find_first_zero_bit(kvmppc_uvmem_bitmap,
@@ -1007,7 +1007,7 @@ static vm_fault_t kvmppc_uvmem_migrate_to_ram(struct vm_fault *vmf)
 static void kvmppc_uvmem_page_free(struct page *page)
 {
        unsigned long pfn = page_to_pfn(page) -
-                       (kvmppc_uvmem_pgmap.res.start >> PAGE_SHIFT);
+                       (kvmppc_uvmem_pgmap.range.start >> PAGE_SHIFT);
        struct kvmppc_uvmem_page_pvt *pvt;
 
        spin_lock(&kvmppc_uvmem_bitmap_lock);
@@ -1170,7 +1170,8 @@ int kvmppc_uvmem_init(void)
        }
 
        kvmppc_uvmem_pgmap.type = MEMORY_DEVICE_PRIVATE;
-       kvmppc_uvmem_pgmap.res = *res;
+       kvmppc_uvmem_pgmap.range.start = res->start;
+       kvmppc_uvmem_pgmap.range.end = res->end;
        kvmppc_uvmem_pgmap.ops = &kvmppc_uvmem_ops;
        /* just one global instance: */
        kvmppc_uvmem_pgmap.owner = &kvmppc_uvmem_pgmap;
@@ -1205,7 +1206,7 @@ void kvmppc_uvmem_free(void)
                return;
 
        memunmap_pages(&kvmppc_uvmem_pgmap);
-       release_mem_region(kvmppc_uvmem_pgmap.res.start,
-                          resource_size(&kvmppc_uvmem_pgmap.res));
+       release_mem_region(kvmppc_uvmem_pgmap.range.start,
+                          range_len(&kvmppc_uvmem_pgmap.range));
        kfree(kvmppc_uvmem_bitmap);
 }