diff options
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/kernel/dma.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/kernel/of_platform.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/iseries/iommu.c | 4 | ||||
| -rw-r--r-- | arch/powerpc/platforms/ps3/system-bus.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c index 1c5c8a6fc12..53c7788cba7 100644 --- a/arch/powerpc/kernel/dma.c +++ b/arch/powerpc/kernel/dma.c | |||
| @@ -94,7 +94,7 @@ static int dma_direct_dma_supported(struct device *dev, u64 mask) | |||
| 94 | * done via some global so platforms can set the limit in case | 94 | * done via some global so platforms can set the limit in case |
| 95 | * they have limited DMA windows | 95 | * they have limited DMA windows |
| 96 | */ | 96 | */ |
| 97 | return mask >= DMA_32BIT_MASK; | 97 | return mask >= DMA_BIT_MASK(32); |
| 98 | #else | 98 | #else |
| 99 | return 1; | 99 | return 1; |
| 100 | #endif | 100 | #endif |
diff --git a/arch/powerpc/kernel/of_platform.c b/arch/powerpc/kernel/of_platform.c index 3f37a6e6277..87df428e358 100644 --- a/arch/powerpc/kernel/of_platform.c +++ b/arch/powerpc/kernel/of_platform.c | |||
| @@ -76,7 +76,7 @@ struct of_device* of_platform_device_create(struct device_node *np, | |||
| 76 | return NULL; | 76 | return NULL; |
| 77 | 77 | ||
| 78 | dev->dma_mask = 0xffffffffUL; | 78 | dev->dma_mask = 0xffffffffUL; |
| 79 | dev->dev.coherent_dma_mask = DMA_32BIT_MASK; | 79 | dev->dev.coherent_dma_mask = DMA_BIT_MASK(32); |
| 80 | 80 | ||
| 81 | dev->dev.bus = &of_platform_bus_type; | 81 | dev->dev.bus = &of_platform_bus_type; |
| 82 | 82 | ||
diff --git a/arch/powerpc/platforms/iseries/iommu.c b/arch/powerpc/platforms/iseries/iommu.c index 6ed75bffc8a..ff43f1fd834 100644 --- a/arch/powerpc/platforms/iseries/iommu.c +++ b/arch/powerpc/platforms/iseries/iommu.c | |||
| @@ -202,7 +202,7 @@ static struct iommu_table vio_iommu_table; | |||
| 202 | void *iseries_hv_alloc(size_t size, dma_addr_t *dma_handle, gfp_t flag) | 202 | void *iseries_hv_alloc(size_t size, dma_addr_t *dma_handle, gfp_t flag) |
| 203 | { | 203 | { |
| 204 | return iommu_alloc_coherent(NULL, &vio_iommu_table, size, dma_handle, | 204 | return iommu_alloc_coherent(NULL, &vio_iommu_table, size, dma_handle, |
| 205 | DMA_32BIT_MASK, flag, -1); | 205 | DMA_BIT_MASK(32), flag, -1); |
| 206 | } | 206 | } |
| 207 | EXPORT_SYMBOL_GPL(iseries_hv_alloc); | 207 | EXPORT_SYMBOL_GPL(iseries_hv_alloc); |
| 208 | 208 | ||
| @@ -217,7 +217,7 @@ dma_addr_t iseries_hv_map(void *vaddr, size_t size, | |||
| 217 | { | 217 | { |
| 218 | return iommu_map_page(NULL, &vio_iommu_table, virt_to_page(vaddr), | 218 | return iommu_map_page(NULL, &vio_iommu_table, virt_to_page(vaddr), |
| 219 | (unsigned long)vaddr % PAGE_SIZE, size, | 219 | (unsigned long)vaddr % PAGE_SIZE, size, |
| 220 | DMA_32BIT_MASK, direction, NULL); | 220 | DMA_BIT_MASK(32), direction, NULL); |
| 221 | } | 221 | } |
| 222 | 222 | ||
| 223 | void iseries_hv_unmap(dma_addr_t dma_handle, size_t size, | 223 | void iseries_hv_unmap(dma_addr_t dma_handle, size_t size, |
diff --git a/arch/powerpc/platforms/ps3/system-bus.c b/arch/powerpc/platforms/ps3/system-bus.c index a705fffbb49..9a73d023863 100644 --- a/arch/powerpc/platforms/ps3/system-bus.c +++ b/arch/powerpc/platforms/ps3/system-bus.c | |||
| @@ -689,7 +689,7 @@ static void ps3_ioc0_unmap_sg(struct device *_dev, struct scatterlist *sg, | |||
| 689 | 689 | ||
| 690 | static int ps3_dma_supported(struct device *_dev, u64 mask) | 690 | static int ps3_dma_supported(struct device *_dev, u64 mask) |
| 691 | { | 691 | { |
| 692 | return mask >= DMA_32BIT_MASK; | 692 | return mask >= DMA_BIT_MASK(32); |
| 693 | } | 693 | } |
| 694 | 694 | ||
| 695 | static struct dma_mapping_ops ps3_sb_dma_ops = { | 695 | static struct dma_mapping_ops ps3_sb_dma_ops = { |
