Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

James Hogan and committed by
Chris Metcalf
ef0aaf87 aaeb012f

+3 -2
+2 -1
arch/tile/include/asm/dma-mapping.h
··· 65 65 extern void dma_sync_single_range_for_device(struct device *, dma_addr_t, 66 66 unsigned long offset, size_t, 67 67 enum dma_data_direction); 68 - extern void dma_cache_sync(void *vaddr, size_t, enum dma_data_direction); 68 + extern void dma_cache_sync(struct device *dev, void *vaddr, size_t, 69 + enum dma_data_direction); 69 70 70 71 static inline int 71 72 dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
+1 -1
arch/tile/kernel/pci-dma.c
··· 244 244 * dma_alloc_noncoherent() returns non-cacheable memory, so there's no 245 245 * need to do any flushing here. 246 246 */ 247 - void dma_cache_sync(void *vaddr, size_t size, 247 + void dma_cache_sync(struct device *dev, void *vaddr, size_t size, 248 248 enum dma_data_direction direction) 249 249 { 250 250 }