diff options
| author | Moritz Fischer <mdf@kernel.org> | 2019-09-03 19:35:07 -0700 |
|---|---|---|
| committer | Moritz Fischer <mdf@kernel.org> | 2019-09-03 19:35:07 -0700 |
| commit | af9ca4b0bd0502bb134f18d394a613be371d2352 (patch) | |
| tree | 37b1159d4456e223981dddde4795f2061c83d14c /kernel/dma/remap.c | |
| parent | cbb4a74478e9eef0f8ef437e95ef7645008988f7 (diff) | |
| parent | 99097a214b0c15f7595ac8f2788662f3941c1992 (diff) | |
| download | kernel_replicant_linux-af9ca4b0bd0502bb134f18d394a613be371d2352.tar.gz kernel_replicant_linux-af9ca4b0bd0502bb134f18d394a613be371d2352.tar.bz2 kernel_replicant_linux-af9ca4b0bd0502bb134f18d394a613be371d2352.zip | |
Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc into fpga-dfl-for-5.4
Diffstat (limited to 'kernel/dma/remap.c')
| -rw-r--r-- | kernel/dma/remap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/dma/remap.c b/kernel/dma/remap.c index a594aec07882..ffe78f0b2fe4 100644 --- a/kernel/dma/remap.c +++ b/kernel/dma/remap.c @@ -218,7 +218,7 @@ void *arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle, /* create a coherent mapping */ ret = dma_common_contiguous_remap(page, size, VM_USERMAP, - arch_dma_mmap_pgprot(dev, PAGE_KERNEL, attrs), + dma_pgprot(dev, PAGE_KERNEL, attrs), __builtin_return_address(0)); if (!ret) { __dma_direct_free_pages(dev, size, page); |