diff options
-rw-r--r-- | arch/x86/kernel/pci-base_32.c | 1 | ||||
-rw-r--r-- | include/asm-x86/dma-mapping.h | 11 | ||||
-rw-r--r-- | include/asm-x86/dma-mapping_32.h | 7 | ||||
-rw-r--r-- | include/asm-x86/dma-mapping_64.h | 12 |
4 files changed, 12 insertions, 19 deletions
diff --git a/arch/x86/kernel/pci-base_32.c b/arch/x86/kernel/pci-base_32.c index 36488245e361..c501599a4506 100644 --- a/arch/x86/kernel/pci-base_32.c +++ b/arch/x86/kernel/pci-base_32.c | |||
@@ -37,6 +37,7 @@ static const struct dma_mapping_ops pci32_dma_ops = { | |||
37 | .unmap_sg = NULL, | 37 | .unmap_sg = NULL, |
38 | .sync_single_for_cpu = NULL, | 38 | .sync_single_for_cpu = NULL, |
39 | .sync_single_for_device = NULL, | 39 | .sync_single_for_device = NULL, |
40 | .sync_single_range_for_cpu = NULL, | ||
40 | }; | 41 | }; |
41 | 42 | ||
42 | const struct dma_mapping_ops *dma_ops = &pci32_dma_ops; | 43 | const struct dma_mapping_ops *dma_ops = &pci32_dma_ops; |
diff --git a/include/asm-x86/dma-mapping.h b/include/asm-x86/dma-mapping.h index 8ad582c2080a..a466470f130d 100644 --- a/include/asm-x86/dma-mapping.h +++ b/include/asm-x86/dma-mapping.h | |||
@@ -114,4 +114,15 @@ dma_sync_single_for_device(struct device *hwdev, dma_addr_t dma_handle, | |||
114 | flush_write_buffers(); | 114 | flush_write_buffers(); |
115 | } | 115 | } |
116 | 116 | ||
117 | static inline void | ||
118 | dma_sync_single_range_for_cpu(struct device *hwdev, dma_addr_t dma_handle, | ||
119 | unsigned long offset, size_t size, int direction) | ||
120 | { | ||
121 | BUG_ON(!valid_dma_direction(direction)); | ||
122 | if (dma_ops->sync_single_range_for_cpu) | ||
123 | dma_ops->sync_single_range_for_cpu(hwdev, dma_handle, offset, | ||
124 | size, direction); | ||
125 | |||
126 | flush_write_buffers(); | ||
127 | } | ||
117 | #endif | 128 | #endif |
diff --git a/include/asm-x86/dma-mapping_32.h b/include/asm-x86/dma-mapping_32.h index b91771a6a0bd..e24c59d76ecb 100644 --- a/include/asm-x86/dma-mapping_32.h +++ b/include/asm-x86/dma-mapping_32.h | |||
@@ -33,13 +33,6 @@ dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size, | |||
33 | } | 33 | } |
34 | 34 | ||
35 | static inline void | 35 | static inline void |
36 | dma_sync_single_range_for_cpu(struct device *dev, dma_addr_t dma_handle, | ||
37 | unsigned long offset, size_t size, | ||
38 | enum dma_data_direction direction) | ||
39 | { | ||
40 | } | ||
41 | |||
42 | static inline void | ||
43 | dma_sync_single_range_for_device(struct device *dev, dma_addr_t dma_handle, | 36 | dma_sync_single_range_for_device(struct device *dev, dma_addr_t dma_handle, |
44 | unsigned long offset, size_t size, | 37 | unsigned long offset, size_t size, |
45 | enum dma_data_direction direction) | 38 | enum dma_data_direction direction) |
diff --git a/include/asm-x86/dma-mapping_64.h b/include/asm-x86/dma-mapping_64.h index b539f61f3c78..6ecafad1554b 100644 --- a/include/asm-x86/dma-mapping_64.h +++ b/include/asm-x86/dma-mapping_64.h | |||
@@ -29,18 +29,6 @@ extern void dma_free_coherent(struct device *dev, size_t size, void *vaddr, | |||
29 | #define dma_unmap_page dma_unmap_single | 29 | #define dma_unmap_page dma_unmap_single |
30 | 30 | ||
31 | static inline void | 31 | static inline void |
32 | dma_sync_single_range_for_cpu(struct device *hwdev, dma_addr_t dma_handle, | ||
33 | unsigned long offset, size_t size, int direction) | ||
34 | { | ||
35 | BUG_ON(!valid_dma_direction(direction)); | ||
36 | if (dma_ops->sync_single_range_for_cpu) { | ||
37 | dma_ops->sync_single_range_for_cpu(hwdev, dma_handle, offset, size, direction); | ||
38 | } | ||
39 | |||
40 | flush_write_buffers(); | ||
41 | } | ||
42 | |||
43 | static inline void | ||
44 | dma_sync_single_range_for_device(struct device *hwdev, dma_addr_t dma_handle, | 32 | dma_sync_single_range_for_device(struct device *hwdev, dma_addr_t dma_handle, |
45 | unsigned long offset, size_t size, int direction) | 33 | unsigned long offset, size_t size, int direction) |
46 | { | 34 | { |