To avoid conflicts with any distribution kernel wrap dma_set_mask_and_coherent with LINUX_BACKPORT().
Signed-off-by: Stefan Assmann <[email protected]> --- backport/backport-include/linux/dma-mapping.h | 1 + 1 file changed, 1 insertion(+) diff --git a/backport/backport-include/linux/dma-mapping.h b/backport/backport-include/linux/dma-mapping.h index 9b2bc90..fdc3331 100644 --- a/backport/backport-include/linux/dma-mapping.h +++ b/backport/backport-include/linux/dma-mapping.h @@ -22,6 +22,7 @@ static inline void *dma_zalloc_coherent(struct device *dev, size_t size, * as the DMA API guarantees that the coherent DMA mask can be set to * the same or smaller than the streaming DMA mask. */ +#define dma_set_mask_and_coherent LINUX_BACKPORT(dma_set_mask_and_coherent) static inline int dma_set_mask_and_coherent(struct device *dev, u64 mask) { int rc = dma_set_mask(dev, mask); -- 1.9.0 -- To unsubscribe from this list: send the line "unsubscribe backports" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
