diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2021-07-02 13:31:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-07-02 13:31:08 -0700 |
| commit | e72b069609aa76cc1de35f5d434dbfaa5392ae9a (patch) | |
| tree | 367b92bae2ab968c8e5d2019ff82672368a14870 /kernel | |
| parent | Merge tag 'iommu-updates-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu (diff) | |
| parent | dma-debug: report -EEXIST errors in add_dma_entry (diff) | |
| download | linux-dev-e72b069609aa76cc1de35f5d434dbfaa5392ae9a.tar.xz linux-dev-e72b069609aa76cc1de35f5d434dbfaa5392ae9a.zip | |
Merge tag 'dma-mapping-5.14' of git://git.infradead.org/users/hch/dma-mapping
Pull dma-mapping updates from Christoph Hellwig:
- a trivivial whitespace fix (Zhen Lei)
- report -EEXIST errors in add_dma_entry (Hamza Mahfooz)
* tag 'dma-mapping-5.14' of git://git.infradead.org/users/hch/dma-mapping:
dma-debug: report -EEXIST errors in add_dma_entry
dma-mapping: remove a trailing space
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/dma/coherent.c | 2 | ||||
| -rw-r--r-- | kernel/dma/debug.c | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/kernel/dma/coherent.c b/kernel/dma/coherent.c index 5b5b6c7ec7f2..794e76b03b34 100644 --- a/kernel/dma/coherent.c +++ b/kernel/dma/coherent.c @@ -111,7 +111,7 @@ static int dma_assign_coherent_memory(struct device *dev, * Declare a region of memory to be handed out by dma_alloc_coherent() when it * is asked for coherent memory for this device. This shall only be used * from platform code, usually based on the device tree description. - * + * * phys_addr is the CPU physical address to which the memory is currently * assigned (this will be ioremapped so the CPU can access the region). * diff --git a/kernel/dma/debug.c b/kernel/dma/debug.c index 14de1271463f..dadae6255d05 100644 --- a/kernel/dma/debug.c +++ b/kernel/dma/debug.c @@ -566,11 +566,9 @@ static void add_dma_entry(struct dma_debug_entry *entry) if (rc == -ENOMEM) { pr_err("cacheline tracking ENOMEM, dma-debug disabled\n"); global_disable = true; + } else if (rc == -EEXIST) { + pr_err("cacheline tracking EEXIST, overlapping mappings aren't supported\n"); } - - /* TODO: report -EEXIST errors here as overlapping mappings are - * not supported by the DMA API - */ } static int dma_debug_create_entries(gfp_t gfp) |