summaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-07-25 17:17:18 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-07-25 17:17:18 -0700
commitcef55b518c7b83020fc8bcc496402242cc921f29 (patch)
tree19a7b10bbeb1fc5086efa058dc091030a70a2495 /arch/mips
parent25f6a53799d667283d3bee29a6ac75ae3dae38dc (diff)
parent878ec36765fa71ffe656bc003d25bb9f8bad28f9 (diff)
downloadop-kernel-dev-cef55b518c7b83020fc8bcc496402242cc921f29.zip
op-kernel-dev-cef55b518c7b83020fc8bcc496402242cc921f29.tar.gz
Merge tag 'dma-mapping-4.13-2' of git://git.infradead.org/users/hch/dma-mapping
Pull dma mapping fixes from Christoph Hellwig: "split the global dma coherent pool from the per-device pool. This fixes a regression in the earlier 4.13 pull requests where the global pool would override a per-device CMA pool (Vladimir Murzin)" * tag 'dma-mapping-4.13-2' of git://git.infradead.org/users/hch/dma-mapping: ARM: NOMMU: Wire-up default DMA interface dma-coherent: introduce interface for default DMA pool
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/mm/dma-default.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c
index e08598c..8e78251 100644
--- a/arch/mips/mm/dma-default.c
+++ b/arch/mips/mm/dma-default.c
@@ -232,7 +232,7 @@ static int mips_dma_mmap(struct device *dev, struct vm_area_struct *vma,
else
vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
- if (dma_mmap_from_coherent(dev, vma, cpu_addr, size, &ret))
+ if (dma_mmap_from_dev_coherent(dev, vma, cpu_addr, size, &ret))
return ret;
if (off < count && user_count <= (count - off)) {
OpenPOWER on IntegriCloud