projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86/vmware' into x86/trampoline
[cascardo/linux.git]
/
include
/
linux
/
dma-mapping.h
diff --git
a/include/linux/dma-mapping.h
b/include/linux/dma-mapping.h
index
ce29b81
..
ba8319a
100644
(file)
--- a/
include/linux/dma-mapping.h
+++ b/
include/linux/dma-mapping.h
@@
-102,6
+102,9
@@
static inline u64 dma_get_mask(struct device *dev)
return DMA_BIT_MASK(32);
}
return DMA_BIT_MASK(32);
}
+#ifdef ARCH_HAS_DMA_SET_COHERENT_MASK
+int dma_set_coherent_mask(struct device *dev, u64 mask);
+#else
static inline int dma_set_coherent_mask(struct device *dev, u64 mask)
{
if (!dma_supported(dev, mask))
static inline int dma_set_coherent_mask(struct device *dev, u64 mask)
{
if (!dma_supported(dev, mask))
@@
-109,6
+112,7
@@
static inline int dma_set_coherent_mask(struct device *dev, u64 mask)
dev->coherent_dma_mask = mask;
return 0;
}
dev->coherent_dma_mask = mask;
return 0;
}
+#endif
extern u64 dma_get_required_mask(struct device *dev);
extern u64 dma_get_required_mask(struct device *dev);