diff options
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/platform.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/drivers/base/platform.c b/drivers/base/platform.c index dff82a3c2caa..cfe22fded980 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c | |||
| @@ -1179,8 +1179,7 @@ int __init platform_bus_init(void) | |||
| 1179 | return error; | 1179 | return error; |
| 1180 | } | 1180 | } |
| 1181 | 1181 | ||
| 1182 | #ifndef ARCH_HAS_DMA_GET_REQUIRED_MASK | 1182 | static u64 dma_default_get_required_mask(struct device *dev) |
| 1183 | u64 dma_get_required_mask(struct device *dev) | ||
| 1184 | { | 1183 | { |
| 1185 | u32 low_totalram = ((max_pfn - 1) << PAGE_SHIFT); | 1184 | u32 low_totalram = ((max_pfn - 1) << PAGE_SHIFT); |
| 1186 | u32 high_totalram = ((max_pfn - 1) >> (32 - PAGE_SHIFT)); | 1185 | u32 high_totalram = ((max_pfn - 1) >> (32 - PAGE_SHIFT)); |
| @@ -1198,6 +1197,16 @@ u64 dma_get_required_mask(struct device *dev) | |||
| 1198 | } | 1197 | } |
| 1199 | return mask; | 1198 | return mask; |
| 1200 | } | 1199 | } |
| 1200 | |||
| 1201 | #ifndef ARCH_HAS_DMA_GET_REQUIRED_MASK | ||
| 1202 | u64 dma_get_required_mask(struct device *dev) | ||
| 1203 | { | ||
| 1204 | const struct dma_map_ops *ops = get_dma_ops(dev); | ||
| 1205 | |||
| 1206 | if (ops->get_required_mask) | ||
| 1207 | return ops->get_required_mask(dev); | ||
| 1208 | return dma_default_get_required_mask(dev); | ||
| 1209 | } | ||
| 1201 | EXPORT_SYMBOL_GPL(dma_get_required_mask); | 1210 | EXPORT_SYMBOL_GPL(dma_get_required_mask); |
| 1202 | #endif | 1211 | #endif |
| 1203 | 1212 | ||
