Merge branch 'devel-stable' into for-next

diff --cc arch/arm/mm/dma-mapping.c
index b05e08c4734cefdd05a9f2594e328ff374b1aeec,18e98dfb73fc1918d5da9285ff25cee38e115d19..85a109bf2e2e99091f9acf966c95d04d9ef0e2f0
--- 1/arch/arm/mm/dma-mapping.c
--- 2/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@@ -901,15 -901,14 +901,15 @@@ static void __dma_page_cpu_to_dev(struc
  static void __dma_page_dev_to_cpu(struct page *page, unsigned long off,
        size_t size, enum dma_data_direction dir)
  {
-       unsigned long paddr = page_to_phys(page) + off;
+       phys_addr_t paddr = page_to_phys(page) + off;
  
        /* FIXME: non-speculating: not required */
 -      /* don't bother invalidating if DMA to device */
 -      if (dir != DMA_TO_DEVICE)
 +      /* in any case, don't bother invalidating if DMA to device */
 +      if (dir != DMA_TO_DEVICE) {
                outer_inv_range(paddr, paddr + size);
  
 -      dma_cache_maint_page(page, off, size, dir, dmac_unmap_area);
 +              dma_cache_maint_page(page, off, size, dir, dmac_unmap_area);
 +      }
  
        /*
         * Mark the D-cache clean for these pages to avoid extra flushing.