diff options
Diffstat (limited to 'arch/sh/mm/consistent.c')
| -rw-r--r-- | arch/sh/mm/consistent.c | 8 | 
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/sh/mm/consistent.c b/arch/sh/mm/consistent.c index 40733a95240..b81d9dbf9fe 100644 --- a/arch/sh/mm/consistent.c +++ b/arch/sh/mm/consistent.c @@ -33,7 +33,8 @@ static int __init dma_init(void)  fs_initcall(dma_init);  void *dma_generic_alloc_coherent(struct device *dev, size_t size, -				 dma_addr_t *dma_handle, gfp_t gfp) +				 dma_addr_t *dma_handle, gfp_t gfp, +				 struct dma_attrs *attrs)  {  	void *ret, *ret_nocache;  	int order = get_order(size); @@ -64,7 +65,8 @@ void *dma_generic_alloc_coherent(struct device *dev, size_t size,  }  void dma_generic_free_coherent(struct device *dev, size_t size, -			       void *vaddr, dma_addr_t dma_handle) +			       void *vaddr, dma_addr_t dma_handle, +			       struct dma_attrs *attrs)  {  	int order = get_order(size);  	unsigned long pfn = dma_handle >> PAGE_SHIFT; @@ -82,7 +84,7 @@ void dma_cache_sync(struct device *dev, void *vaddr, size_t size,  	void *addr;  	addr = __in_29bit_mode() ? -	       (void *)P1SEGADDR((unsigned long)vaddr) : vaddr; +	       (void *)CAC_ADDR((unsigned long)vaddr) : vaddr;  	switch (direction) {  	case DMA_FROM_DEVICE:		/* invalidate only */  | 
