diff options
| author | Stefan Assmann <sassmann@kpanic.de> | 2014-06-06 01:02:42 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-06-17 21:16:40 +0200 |
| commit | 9630d32a00961fd429bafd90c97d3cdfd1865564 (patch) | |
| tree | 983a903472e5abbc642852941f90c47e5900672a | |
| parent | 2a25483c93f9f7b0c36c8dcca7e1aae54f7602f8 (diff) | |
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 <sassmann@kpanic.de>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Signed-off-by: Christian Ratzenhofer <christian.ratzenhofer@cdnm.at>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
| -rw-r--r-- | backport/backport-include/linux/dma-mapping.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/backport/backport-include/linux/dma-mapping.h b/backport/backport-include/linux/dma-mapping.h index 9b2bc905..fdc3331b 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); |