Merge tag 'dma-mapping-5.4-1' of git://git.infradead.org/users/hch/dma-mapping

7cdb85df · Linus Torvalds <[email protected]> · 2019-10-06 11:10:15 -07:00

Pull dma-mapping regression fix from Christoph Hellwig:
 "Revert an incorret hunk from a patch that caused problems on various
  arm boards (Andrey Smirnov)"

* tag 'dma-mapping-5.4-1' of git://git.infradead.org/users/hch/dma-mapping:
  dma-mapping: fix false positive warnings in dma_common_free_remap()

Commit: 7cdb85df6061d001fffd09c6adfbcf20356615e2
Parents: 43b815c6 · 2cf2aa6a

Merge commit. Changes below are compared with the first parent: 43b815c6.

Changes

1 files changed · +2 −2

File	Status	Add	Del	Content
kernel/dma/remap.c	modified	+2	−2	View file

kernel/dma/remap.c

View file

diff --git a/kernel/dma/remap.c b/kernel/dma/remap.c
index ca4e5d4..c00b925 100644
--- a/kernel/dma/remap.c
+++ b/kernel/dma/remap.c
@@ -87,9 +87,9 @@ void *dma_common_contiguous_remap(struct page *page, size_t size,
  */
 void dma_common_free_remap(void *cpu_addr, size_t size)
 {
-	struct page **pages = dma_common_find_pages(cpu_addr);
+	struct vm_struct *area = find_vm_area(cpu_addr);
 
-	if (!pages) {
+	if (!area || area->flags != VM_DMA_COHERENT) {
 		WARN(1, "trying to free invalid coherent area: %p\n", cpu_addr);
 		return;
 	}