diff options
| author | James Hogan <james.hogan@imgtec.com> | 2011-04-04 16:21:47 +0100 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2011-05-04 14:41:36 -0400 |
| commit | ef0aaf873ebadd7576f4fb2085ec4557a9df8bf5 (patch) | |
| tree | 5915716fb8aaacb0226b18df9ea49a22258d30e4 | |
| parent | aaeb012fe4700cb808562c2daf7ccc464e7f18cf (diff) | |
| download | op-kernel-dev-ef0aaf873ebadd7576f4fb2085ec4557a9df8bf5.zip op-kernel-dev-ef0aaf873ebadd7576f4fb2085ec4557a9df8bf5.tar.gz | |
tile,mn10300: add device parameter to dma_cache_sync()
Since v2.6.20 "Pass struct dev pointer to dma_cache_sync()"
(d3fa72e4556ec1f04e46a0d561d9e785ecaa173d), dma_cache_sync() takes a
struct dev pointer, but these appear to be missing from the tile and
mn10300 implementations, so add them.
Signed-off-by: James Hogan <james.hogan@imgtec.com>
[cmetcalf@tilera.com: took only the "tile" portion as I don't maintain mn10300]
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
| -rw-r--r-- | arch/tile/include/asm/dma-mapping.h | 3 | ||||
| -rw-r--r-- | arch/tile/kernel/pci-dma.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/tile/include/asm/dma-mapping.h b/arch/tile/include/asm/dma-mapping.h index 15e1dce..eaa06d1 100644 --- a/arch/tile/include/asm/dma-mapping.h +++ b/arch/tile/include/asm/dma-mapping.h @@ -65,7 +65,8 @@ extern void dma_sync_single_range_for_cpu(struct device *, dma_addr_t, extern void dma_sync_single_range_for_device(struct device *, dma_addr_t, unsigned long offset, size_t, enum dma_data_direction); -extern void dma_cache_sync(void *vaddr, size_t, enum dma_data_direction); +extern void dma_cache_sync(struct device *dev, void *vaddr, size_t, + enum dma_data_direction); static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) diff --git a/arch/tile/kernel/pci-dma.c b/arch/tile/kernel/pci-dma.c index 658752b2..658f2ce 100644 --- a/arch/tile/kernel/pci-dma.c +++ b/arch/tile/kernel/pci-dma.c @@ -244,7 +244,7 @@ EXPORT_SYMBOL(dma_sync_single_range_for_device); * dma_alloc_noncoherent() returns non-cacheable memory, so there's no * need to do any flushing here. */ -void dma_cache_sync(void *vaddr, size_t size, +void dma_cache_sync(struct device *dev, void *vaddr, size_t size, enum dma_data_direction direction) { } |
