Merge tag 'xtensa-20150526' of git://github.com/czankel/xtensa-linux

ace6a22a · Linus Torvalds <[email protected]> · 2015-05-28 13:28:24 -07:00

Pull Xtensa fix from Chris Zankel:
 "This fixes allmodconfig, which fails to build due to missing
  dma_alloc_attrs() and dma_free_attrs() functions"

* tag 'xtensa-20150526' of git://github.com/czankel/xtensa-linux:
  xtensa: Provide dummy dma_alloc_attrs() and dma_free_attrs()

Commit: ace6a22a9fbcdba0ccf190f97b82a79ef2f44aeb
Parents: 1263193d · e74993ae

Merge commit. Changes below are compared with the first parent: 1263193d.

Changes

1 files changed · +13 −0

File	Status	Add	Del	Content
arch/xtensa/include/asm/dma-mapping.h	modified	+13	−0	View file

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

View file

diff --git a/arch/xtensa/include/asm/dma-mapping.h b/arch/xtensa/include/asm/dma-mapping.h
index 172a02a..ba78ccf 100644
--- a/arch/xtensa/include/asm/dma-mapping.h
+++ b/arch/xtensa/include/asm/dma-mapping.h
@@ -185,4 +185,17 @@ static inline int dma_get_sgtable(struct device *dev, struct sg_table *sgt,
 	return -EINVAL;
 }
 
+static inline void *dma_alloc_attrs(struct device *dev, size_t size,
+				    dma_addr_t *dma_handle, gfp_t flag,
+				    struct dma_attrs *attrs)
+{
+	return NULL;
+}
+
+static inline void dma_free_attrs(struct device *dev, size_t size,
+				  void *vaddr, dma_addr_t dma_handle,
+				  struct dma_attrs *attrs)
+{
+}
+
 #endif	/* _XTENSA_DMA_MAPPING_H */