diff options
| author | Will Deacon <will@kernel.org> | 2021-10-29 12:25:19 +0100 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2021-10-29 12:25:19 +0100 |
| commit | 16c200e0404510c416ea7348a6a1dbe9c2d262e5 (patch) | |
| tree | d90a809724dc41298e0eedf2ad86dfc649bc7227 /kernel | |
| parent | bd334dd7def6debd1c318f57a539242c14c43bb9 (diff) | |
| parent | 3de360c3fdb34fbdbaf6da3af94367d3fded95d3 (diff) | |
Merge branch 'for-next/pfn-valid' into for-next/core
* for-next/pfn-valid:
arm64/mm: drop HAVE_ARCH_PFN_VALID
dma-mapping: remove bogus test for pfn_valid from dma_map_resource
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/dma/mapping.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/kernel/dma/mapping.c b/kernel/dma/mapping.c index 06fec5547e7c..dda8d8b84a55 100644 --- a/kernel/dma/mapping.c +++ b/kernel/dma/mapping.c @@ -296,10 +296,6 @@ dma_addr_t dma_map_resource(struct device *dev, phys_addr_t phys_addr, if (WARN_ON_ONCE(!dev->dma_mask)) return DMA_MAPPING_ERROR; - /* Don't allow RAM to be mapped */ - if (WARN_ON_ONCE(pfn_valid(PHYS_PFN(phys_addr)))) - return DMA_MAPPING_ERROR; - if (dma_map_direct(dev, ops)) addr = dma_direct_map_resource(dev, phys_addr, size, dir, attrs); else if (ops->map_resource) |