xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branches 'alignment', 'fixes', 'l2c' (early part) and 'misc' into for-next

Browse Source
This commit is contained in:
Russell King
2014-06-05 12:35:52 +01:00
parent 20e7e36433 3f8517e793 8ef418c717 1c2f87c225
commit 1fb333489f
135 changed files with 2173 additions and 1546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/mm/dma-mapping.c
View File

@@ -904,11 +904,12 @@ static void __dma_page_dev_to_cpu(struct page *page, unsigned long off,
unsigned long 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.