From: Russell King Date: Thu, 5 Jun 2014 11:36:22 +0000 (+0100) Subject: Merge branch 'devel-stable' into for-next X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bd63ce27d9d62bc40a962b991cbbbe4f0dc913d2;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge branch 'devel-stable' into for-next --- bd63ce27d9d62bc40a962b991cbbbe4f0dc913d2 diff --cc arch/arm/mm/dma-mapping.c index b05e08c4734c,18e98dfb73fc..85a109bf2e2e --- a/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.