浏览代码

x86: move dma_sync_single_for_cpu to common header

i386 gets an empty function.

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Glauber Costa 17 年之前
父节点
当前提交
c01dd8cf7d
共有 4 个文件被更改,包括 13 次插入17 次删除
  1. 1 0
      arch/x86/kernel/pci-base_32.c
  2. 12 0
      include/asm-x86/dma-mapping.h
  3. 0 6
      include/asm-x86/dma-mapping_32.h
  4. 0 11
      include/asm-x86/dma-mapping_64.h

+ 1 - 0
arch/x86/kernel/pci-base_32.c

@@ -35,6 +35,7 @@ static const struct dma_mapping_ops pci32_dma_ops = {
 	.unmap_single = NULL,
 	.unmap_single = NULL,
 	.map_sg = pci32_dma_map_sg,
 	.map_sg = pci32_dma_map_sg,
 	.unmap_sg = NULL,
 	.unmap_sg = NULL,
+	.sync_single_for_cpu = NULL,
 };
 };
 
 
 const struct dma_mapping_ops *dma_ops = &pci32_dma_ops;
 const struct dma_mapping_ops *dma_ops = &pci32_dma_ops;

+ 12 - 0
include/asm-x86/dma-mapping.h

@@ -91,4 +91,16 @@ dma_unmap_sg(struct device *hwdev, struct scatterlist *sg, int nents,
 	if (dma_ops->unmap_sg)
 	if (dma_ops->unmap_sg)
 		dma_ops->unmap_sg(hwdev, sg, nents, direction);
 		dma_ops->unmap_sg(hwdev, sg, nents, direction);
 }
 }
+
+static inline void
+dma_sync_single_for_cpu(struct device *hwdev, dma_addr_t dma_handle,
+			size_t size, int direction)
+{
+	BUG_ON(!valid_dma_direction(direction));
+	if (dma_ops->sync_single_for_cpu)
+		dma_ops->sync_single_for_cpu(hwdev, dma_handle, size,
+					     direction);
+	flush_write_buffers();
+}
+
 #endif
 #endif

+ 0 - 6
include/asm-x86/dma-mapping_32.h

@@ -32,12 +32,6 @@ dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size,
 	BUG_ON(!valid_dma_direction(direction));
 	BUG_ON(!valid_dma_direction(direction));
 }
 }
 
 
-static inline void
-dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle, size_t size,
-			enum dma_data_direction direction)
-{
-}
-
 static inline void
 static inline void
 dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle, size_t size,
 dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle, size_t size,
 			enum dma_data_direction direction)
 			enum dma_data_direction direction)

+ 0 - 11
include/asm-x86/dma-mapping_64.h

@@ -28,17 +28,6 @@ extern void dma_free_coherent(struct device *dev, size_t size, void *vaddr,
 
 
 #define dma_unmap_page dma_unmap_single
 #define dma_unmap_page dma_unmap_single
 
 
-static inline void
-dma_sync_single_for_cpu(struct device *hwdev, dma_addr_t dma_handle,
-			size_t size, int direction)
-{
-	BUG_ON(!valid_dma_direction(direction));
-	if (dma_ops->sync_single_for_cpu)
-		dma_ops->sync_single_for_cpu(hwdev, dma_handle, size,
-					     direction);
-	flush_write_buffers();
-}
-
 static inline void
 static inline void
 dma_sync_single_for_device(struct device *hwdev, dma_addr_t dma_handle,
 dma_sync_single_for_device(struct device *hwdev, dma_addr_t dma_handle,
 			   size_t size, int direction)
 			   size_t size, int direction)