diff options
| author | Stefan Assmann <sassmann@kpanic.de> | 2014-04-25 09:14:28 +0200 |
|---|---|---|
| committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2014-05-01 18:44:13 -0700 |
| commit | 3443187edd32767c838e5d4f654df474e77fb7ce (patch) | |
| tree | 5c8de6b6504418b816bfa7a0d042e137b0cd79f7 /backport | |
| parent | 9399b9d9116e3e0eee78c4f87f040f54b6e4d1c9 (diff) | |
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 <sassmann@kpanic.de>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Diffstat (limited to 'backport')
| -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); |