summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-05-28 13:28:24 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-05-28 13:28:24 -0700
commitace6a22a9fbcdba0ccf190f97b82a79ef2f44aeb (patch)
tree8e804cad0f8b5a5e45e8bcd78713f6d2632df6a0 /arch
parent1263193d1a269b87fe96aecfd7d1d5769da77ef6 (diff)
parente74993aef4411995960052506a000f94411a7103 (diff)
Merge tag 'xtensa-20150526' of git://github.com/czankel/xtensa-linux
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()
Diffstat (limited to 'arch')
-rw-r--r--arch/xtensa/include/asm/dma-mapping.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/xtensa/include/asm/dma-mapping.h b/arch/xtensa/include/asm/dma-mapping.h
index 172a02a6ad14..ba78ccf651e7 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 */