Merge tag 'iommu-updates-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / base / dma-mapping.c

diff --git a/drivers/base/dma-mapping.c b/drivers/base/dma-mapping.c
index 755a2b5354c5886a330e79ca5c52c81d63e74747..f3deb6af42ad1473364ace69908cbd0908e9c6d5 100644 (file)
--- a/drivers/base/dma-mapping.c
+++ b/drivers/base/dma-mapping.c
@@ -311,14 +311,13 @@ void *dma_common_contiguous_remap(struct page *page, size_t size,
        int i;
        struct page **pages;
        void *ptr;
-       unsigned long pfn;
 
        pages = kmalloc(sizeof(struct page *) << get_order(size), GFP_KERNEL);
        if (!pages)
                return NULL;
 
-       for (i = 0, pfn = page_to_pfn(page); i < (size >> PAGE_SHIFT); i++)
-               pages[i] = pfn_to_page(pfn + i);
+       for (i = 0; i < (size >> PAGE_SHIFT); i++)
+               pages[i] = nth_page(page, i);
 
        ptr = dma_common_pages_remap(pages, size, vm_flags, prot, caller);