embeded-sourcecoder
diff --git a/‎Documentation/driver-model/devres.txt
Lines changed: 0 additions & 1 deletion b/‎Documentation/driver-model/devres.txt
Lines changed: 0 additions & 1 deletion
diff --git a/‎arch/x86/kernel/amd_gart_64.c
Lines changed: 9 additions & 1 deletion b/‎arch/x86/kernel/amd_gart_64.c
Lines changed: 9 additions & 1 deletion
diff --git a/‎include/linux/dma-debug.h
Lines changed: 4 additions & 7 deletions b/‎include/linux/dma-debug.h
Lines changed: 4 additions & 7 deletions
@@ -250,7 +250,6 @@ DMA
   dmaenginem_async_device_register()
   dmam_alloc_coherent()
   dmam_alloc_attrs()
-  dmam_declare_coherent_memory()
   dmam_free_coherent()
   dmam_pool_create()
   dmam_pool_destroy()
 
@@ -256,7 +256,15 @@ static void gart_unmap_page(struct device *dev, dma_addr_t dma_addr,
 	int npages;
 	int i;
 
-	if (dma_addr == DMA_MAPPING_ERROR ||
+	if (WARN_ON_ONCE(dma_addr == DMA_MAPPING_ERROR))
+		return;
+
+	/*
+	 * This driver will not always use a GART mapping, but might have
+	 * created a direct mapping instead.  If that is the case there is
+	 * nothing to unmap here.
+	 */
+	if (dma_addr < iommu_bus_base ||
 	    dma_addr >= iommu_bus_base + iommu_size)
 		return;
 
 
@@ -35,13 +35,12 @@ extern void debug_dma_map_single(struct device *dev, const void *addr,
 
 extern void debug_dma_map_page(struct device *dev, struct page *page,
 			       size_t offset, size_t size,
-			       int direction, dma_addr_t dma_addr,
-			       bool map_single);
+			       int direction, dma_addr_t dma_addr);
 
 extern void debug_dma_mapping_error(struct device *dev, dma_addr_t dma_addr);
 
 extern void debug_dma_unmap_page(struct device *dev, dma_addr_t addr,
-				 size_t size, int direction, bool map_single);
+				 size_t size, int direction);
 
 extern void debug_dma_map_sg(struct device *dev, struct scatterlist *sg,
 			     int nents, int mapped_ents, int direction);
@@ -95,8 +94,7 @@ static inline void debug_dma_map_single(struct device *dev, const void *addr,
 
 static inline void debug_dma_map_page(struct device *dev, struct page *page,
 				      size_t offset, size_t size,
-				      int direction, dma_addr_t dma_addr,
-				      bool map_single)
+				      int direction, dma_addr_t dma_addr)
 {
 }
 
@@ -106,8 +104,7 @@ static inline void debug_dma_mapping_error(struct device *dev,
 }
 
 static inline void debug_dma_unmap_page(struct device *dev, dma_addr_t addr,
-					size_t size, int direction,
-					bool map_single)
+					size_t size, int direction)
 {
 }
Original file line number	Diff line number	Diff line change
`@@ -35,13 +35,12 @@ extern void debug_dma_map_single(struct device dev, const void addr,`
`35`	`35`
`36`	`36`	`extern void debug_dma_map_page(struct device dev, struct page page,`
`37`	`37`	`size_t offset, size_t size,`
`38`		`- int direction, dma_addr_t dma_addr,`
`39`		`- bool map_single);`
	`38`	`+ int direction, dma_addr_t dma_addr);`
`40`	`39`
`41`	`40`	`extern void debug_dma_mapping_error(struct device *dev, dma_addr_t dma_addr);`
`42`	`41`
`43`	`42`	`extern void debug_dma_unmap_page(struct device *dev, dma_addr_t addr,`
`44`		`- size_t size, int direction, bool map_single);`
	`43`	`+ size_t size, int direction);`
`45`	`44`
`46`	`45`	`extern void debug_dma_map_sg(struct device dev, struct scatterlist sg,`
`47`	`46`	`int nents, int mapped_ents, int direction);`
`@@ -95,8 +94,7 @@ static inline void debug_dma_map_single(struct device dev, const void addr,`
`95`	`94`
`96`	`95`	`static inline void debug_dma_map_page(struct device dev, struct page page,`
`97`	`96`	`size_t offset, size_t size,`
`98`		`- int direction, dma_addr_t dma_addr,`
`99`		`- bool map_single)`
	`97`	`+ int direction, dma_addr_t dma_addr)`
`100`	`98`	`{`
`101`	`99`	`}`
`102`	`100`
`@@ -106,8 +104,7 @@ static inline void debug_dma_mapping_error(struct device *dev,`
`106`	`104`	`}`
`107`	`105`
`108`	`106`	`static inline void debug_dma_unmap_page(struct device *dev, dma_addr_t addr,`
`109`		`- size_t size, int direction,`
`110`		`- bool map_single)`
	`107`	`+ size_t size, int direction)`
`111`	`108`	`{`
`112`	`109`	`}`
`113`	`110`