diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-08-10 12:02:26 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-10 12:02:26 +0200 |
| commit | 1ccb2f4e8e435a53bb378e8b092087f091754aa6 (patch) | |
| tree | ba120509947138915e06ad39cca5f065bd99f42f /arch/mips/mm/dma-default.c | |
| parent | c3a3800fe46f00ceeeb181cc07cc4fdaed4574f1 (diff) | |
| parent | 9b231d9f47c6114d317ce28cff92a74ad80547f5 (diff) | |
| download | op-kernel-dev-1ccb2f4e8e435a53bb378e8b092087f091754aa6.zip op-kernel-dev-1ccb2f4e8e435a53bb378e8b092087f091754aa6.tar.gz | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/mips/mm/dma-default.c')
| -rw-r--r-- | arch/mips/mm/dma-default.c | 2 |
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)) { |
