Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 22:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

x86: move dma_sync_sg_for_cpu to common header

Browse Source 
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>
This commit is contained in:
Glauber Costa 2008-03-25 18:36:29 -03:00 committed by Ingo Molnar
parent 713623326c
commit ed435dee9c
4 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/kernel/pci-base_32.c
View File

@ -39,6 +39,7 @@ static const struct dma_mapping_ops pci32_dma_ops = {
.sync_single_for_device = NULL, .sync_single_for_device = NULL,
.sync_single_range_for_cpu = NULL, .sync_single_range_for_cpu = NULL,
.sync_single_range_for_device = NULL, .sync_single_range_for_device = NULL,
.sync_sg_for_cpu = NULL,
}; };
const struct dma_mapping_ops *dma_ops = &pci32_dma_ops; const struct dma_mapping_ops *dma_ops = &pci32_dma_ops;

9
include/asm-x86/dma-mapping.h
View File

@ -139,4 +139,13 @@ dma_sync_single_range_for_device(struct device *hwdev, dma_addr_t dma_handle,
flush_write_buffers(); flush_write_buffers();
} }
static inline void
dma_sync_sg_for_cpu(struct device *hwdev, struct scatterlist *sg,
int nelems, int direction)
{
BUG_ON(!valid_dma_direction(direction));
if (dma_ops->sync_sg_for_cpu)
dma_ops->sync_sg_for_cpu(hwdev, sg, nelems, direction);
flush_write_buffers();
}
#endif #endif

6
include/asm-x86/dma-mapping_32.h
View File

@ -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_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems,
enum dma_data_direction direction)
{
}
static inline void static inline void
dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nelems, dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nelems,
enum dma_data_direction direction) enum dma_data_direction direction)

11
include/asm-x86/dma-mapping_64.h
View File

@ -27,17 +27,6 @@ extern void dma_free_coherent(struct device *dev, size_t size, void *vaddr,
dma_map_single((dev), page_address(page)+(offset), (size), (dir)) dma_map_single((dev), page_address(page)+(offset), (size), (dir))
#define dma_unmap_page dma_unmap_single #define dma_unmap_page dma_unmap_single
static inline void
dma_sync_sg_for_cpu(struct device *hwdev, struct scatterlist *sg,
int nelems, int direction)
{
BUG_ON(!valid_dma_direction(direction));
if (dma_ops->sync_sg_for_cpu)
dma_ops->sync_sg_for_cpu(hwdev, sg, nelems, direction);
flush_write_buffers();
}
static inline void static inline void
dma_sync_sg_for_device(struct device *hwdev, struct scatterlist *sg, dma_sync_sg_for_device(struct device *hwdev, struct scatterlist *sg,
int nelems, int direction) int nelems, int direction)