From: Stefan Assmann <sassmann@xxxxxxxxx>
Upstream commit: 3443187edd32767c838e5d4f654df474e77fb7ce
To avoid conflicts with any distribution kernel wrap
dma_set_mask_and_coherent with LINUX_BACKPORT().
Signed-off-by: Stefan Assmann <sassmann@xxxxxxxxx>
Signed-off-by: Luis R. Rodriguez <mcgrof@xxxxxxxxxxxxxxxx>
Signed-off-by: Christian Ratzenhofer <christian.ratzenhofer@xxxxxxx>
---
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 6c4973a..62834d3 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);
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe backports" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
