Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae979430 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc 

Pull sparc fixlet from David Miller:
 "Aparc fix to add dma_cache_sync(), even if a nop it should be provided
  if dma_{alloc,free}_noncoherent() is provided too"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc: Add NOP dma_cache_sync() implementation.
parents 8e845971 0d1d9092

arch/sparc/include/asm/dma-mapping.h

+8 −0
Original line number Diff line number Diff line
@@ -12,6 +12,14 @@ int dma_supported(struct device *dev, u64 mask); 
#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)

#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)



static inline void dma_cache_sync(struct device *dev, void *vaddr, size_t size,

				  enum dma_data_direction dir)

{

	/* Since dma_{alloc,free}_noncoherent() allocated coherent memory, this

	 * routine can be a nop.

	 */

}



extern struct dma_map_ops *dma_ops;

extern struct dma_map_ops *leon_dma_ops;

extern struct dma_map_ops pci32_dma_ops;