Commit e72b0696 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents cd3eb7ef 2b4bbc62

kernel/dma/debug.c

+2 −4
Original line number Diff line number Diff line
@@ -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)

kernel/dma/coherent.c

+1 −1

File changed.

Contains only whitespace changes.