From 3443187edd32767c838e5d4f654df474e77fb7ce Mon Sep 17 00:00:00 2001 From: Stefan Assmann Date: Fri, 25 Apr 2014 09:14:28 +0200 Subject: [PATCH] backports: wrap dma_set_mask_and_coherent in LINUX_BACKPORT() To avoid conflicts with any distribution kernel wrap dma_set_mask_and_coherent with LINUX_BACKPORT(). Signed-off-by: Stefan Assmann Signed-off-by: Luis R. Rodriguez --- 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 9b2bc9058bce..fdc3331b63fb 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); -- 2.30.2