From fa8c97a23760f92052c495f2fa9fe5a6e7702173 Mon Sep 17 00:00:00 2001 From: Stefan Assmann Date: Fri, 6 Jun 2014 01:02:42 +0200 Subject: backports: wrap dma_set_mask_and_coherent in LINUX_BACKPORT() Upstream commit: 3443187edd32767c838e5d4f654df474e77fb7ce 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 Signed-off-by: Christian Ratzenhofer Signed-off-by: Hauke Mehrtens --- 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 6c4973a5..62834d36 100644 --- a/backport/backport-include/linux/dma-mapping.h +++ b/backport/backport-include/linux/dma-mapping.h @@ -97,6 +97,7 @@ static inline void dma_sync_single_range_for_device(struct device *dev, * 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); -- cgit v1.2.3