ion: don't use phys_to_page or __phys_to_pfn

phys_to_page and __phys_to_pfn don't exist on all platforms.
Use a combination of pfn_to_page, PFN_DOWN, page_to_pfn, and
virt_to_page to get the same results.

Change-Id: I53cef26059800bc8b7fb85ae458741574c97c257
Signed-off-by: Colin Cross <ccross@android.com>

diff --git a/drivers/staging/android/ion/ion_carveout_heap.c b/drivers/staging/android/ion/ion_carveout_heap.c
index f53e7008d6d70a56bad5185ee7d9082e4a10fe5c..ed2b7ae709644b82569266218165aba2e4b8e04b 100644 (file)
--- a/drivers/staging/android/ion/ion_carveout_heap.c
+++ b/drivers/staging/android/ion/ion_carveout_heap.c
@@ -96,8 +96,8 @@ struct sg_table *ion_carveout_heap_map_dma(struct ion_heap *heap,
                kfree(table);
                return ERR_PTR(ret);
        }
-       sg_set_page(table->sgl, phys_to_page(buffer->priv_phys), buffer->size,
-                   0);
+       sg_set_page(table->sgl, pfn_to_page(PFN_DOWN(buffer->priv_phys)),
+                       buffer->size, 0);
        return table;
 }
 

diff --git a/drivers/staging/android/ion/ion_chunk_heap.c b/drivers/staging/android/ion/ion_chunk_heap.c
index 3ca4b90424c08971e3870d6ee9450c2141bc442b..e17b6016db54d7fcf00cb2c9ca455e4d8a6193a1 100644 (file)
--- a/drivers/staging/android/ion/ion_chunk_heap.c
+++ b/drivers/staging/android/ion/ion_chunk_heap.c
@@ -71,7 +71,8 @@ static int ion_chunk_heap_allocate(struct ion_heap *heap,
                                                     chunk_heap->chunk_size);
                if (!paddr)
                        goto err;
-               sg_set_page(sg, phys_to_page(paddr), chunk_heap->chunk_size, 0);
+               sg_set_page(sg, pfn_to_page(PFN_DOWN(paddr)),
+                               chunk_heap->chunk_size, 0);
                sg = sg_next(sg);
        }
 
@@ -167,7 +168,7 @@ struct ion_heap *ion_chunk_heap_create(struct ion_platform_heap *heap_data)
                goto error;
        }
        for (i = 0; i < chunk_heap->size; i += PAGE_SIZE) {
-               struct page *page = phys_to_page(chunk_heap->base + i);
+               struct page *page = pfn_to_page(PFN_DOWN(chunk_heap->base + i));
                struct page **pages = &page;
 
                ret = map_vm_area(vm_struct, pgprot, &pages);

diff --git a/drivers/staging/android/ion/ion_system_heap.c b/drivers/staging/android/ion/ion_system_heap.c
index 4eb0ae8c6756e9d5ed771ab654ea88f706fbe4c4..954eb56e7157b4257fa930e562b5a2b03f7d8838 100644 (file)
--- a/drivers/staging/android/ion/ion_system_heap.c
+++ b/drivers/staging/android/ion/ion_system_heap.c
@@ -426,7 +426,7 @@ int ion_system_contig_heap_map_user(struct ion_heap *heap,
                                    struct ion_buffer *buffer,
                                    struct vm_area_struct *vma)
 {
-       unsigned long pfn = __phys_to_pfn(virt_to_phys(buffer->priv_virt));
+       unsigned long pfn = page_to_pfn(virt_to_page(buffer->priv_virt));
        return remap_pfn_range(vma, vma->vm_start, pfn + vma->vm_pgoff,
                               vma->vm_end - vma->vm_start,
                               vma->vm_page_prot);