Merge tag 'xtensa-20150526' of git://github.com/czankel/xtensa-linux (ace6a22a) · Commits · 戴 / test

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()

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

+13 −0

Original line number	Diff line number	Diff line
		@@ -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 */

Admin message