---

yaml --- r: 91000 b: refs/heads/master c: 627610f h: refs/heads/master v: v3
git-mirror · Apr 19, 2008 · 95a20b8 · 95a20b8
1 parent 8ebebe7
commit 95a20b8
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 20 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9231b269e09ed60910c159cf668f887623b7ac58
+refs/heads/master: 627610fcb70164991ed0d11110a56c43b15b9312
diff --git a/trunk/arch/x86/kernel/pci-base_32.c b/trunk/arch/x86/kernel/pci-base_32.c
@@ -37,6 +37,7 @@ static const struct dma_mapping_ops pci32_dma_ops = {
 	.unmap_sg = NULL,
 	.sync_single_for_cpu = NULL,
 	.sync_single_for_device = NULL,
+	.sync_single_range_for_cpu = NULL,
 };
 
 const struct dma_mapping_ops *dma_ops = &pci32_dma_ops;

diff --git a/trunk/include/asm-x86/dma-mapping.h b/trunk/include/asm-x86/dma-mapping.h
@@ -114,4 +114,15 @@ dma_sync_single_for_device(struct device *hwdev, dma_addr_t dma_handle,
 	flush_write_buffers();
 }
 
+static inline void
+dma_sync_single_range_for_cpu(struct device *hwdev, dma_addr_t dma_handle,
+			      unsigned long offset, size_t size, int direction)
+{
+	BUG_ON(!valid_dma_direction(direction));
+	if (dma_ops->sync_single_range_for_cpu)
+		dma_ops->sync_single_range_for_cpu(hwdev, dma_handle, offset,
+						   size, direction);
+
+	flush_write_buffers();
+}
 #endif
diff --git a/trunk/include/asm-x86/dma-mapping_32.h b/trunk/include/asm-x86/dma-mapping_32.h
@@ -32,13 +32,6 @@ dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size,
 	BUG_ON(!valid_dma_direction(direction));
 }
 
-static inline void
-dma_sync_single_range_for_cpu(struct device *dev, dma_addr_t dma_handle,
-			      unsigned long offset, size_t size,
-			      enum dma_data_direction direction)
-{
-}
-
 static inline void
 dma_sync_single_range_for_device(struct device *dev, dma_addr_t dma_handle,
 				 unsigned long offset, size_t size,

diff --git a/trunk/include/asm-x86/dma-mapping_64.h b/trunk/include/asm-x86/dma-mapping_64.h
@@ -28,18 +28,6 @@ extern void dma_free_coherent(struct device *dev, size_t size, void *vaddr,
 
 #define dma_unmap_page dma_unmap_single
 
-static inline void
-dma_sync_single_range_for_cpu(struct device *hwdev, dma_addr_t dma_handle,
-			      unsigned long offset, size_t size, int direction)
-{
-	BUG_ON(!valid_dma_direction(direction));
-	if (dma_ops->sync_single_range_for_cpu) {
-		dma_ops->sync_single_range_for_cpu(hwdev, dma_handle, offset, size, direction);
-	}
-
-	flush_write_buffers();
-}
-
 static inline void
 dma_sync_single_range_for_device(struct device *hwdev, dma_addr_t dma_handle,
 				 unsigned long offset, size_t size, int direction)