diff options
Diffstat (limited to 'arch/arm/mm/dma-mapping.c')
-rw-r--r-- | arch/arm/mm/dma-mapping.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index 79f8b39801a8..f0ea0134e5a3 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c | |||
@@ -361,7 +361,7 @@ void __init init_dma_coherent_pool_size(unsigned long size) | |||
361 | static int __init atomic_pool_init(void) | 361 | static int __init atomic_pool_init(void) |
362 | { | 362 | { |
363 | struct dma_pool *pool = &atomic_pool; | 363 | struct dma_pool *pool = &atomic_pool; |
364 | pgprot_t prot = pgprot_dmacoherent(pgprot_kernel); | 364 | pgprot_t prot = pgprot_dmacoherent(PAGE_KERNEL); |
365 | gfp_t gfp = GFP_KERNEL | GFP_DMA; | 365 | gfp_t gfp = GFP_KERNEL | GFP_DMA; |
366 | unsigned long nr_pages = pool->size >> PAGE_SHIFT; | 366 | unsigned long nr_pages = pool->size >> PAGE_SHIFT; |
367 | unsigned long *bitmap; | 367 | unsigned long *bitmap; |
@@ -609,7 +609,7 @@ static void __free_from_contiguous(struct device *dev, struct page *page, | |||
609 | if (PageHighMem(page)) | 609 | if (PageHighMem(page)) |
610 | __dma_free_remap(cpu_addr, size); | 610 | __dma_free_remap(cpu_addr, size); |
611 | else | 611 | else |
612 | __dma_remap(page, size, pgprot_kernel); | 612 | __dma_remap(page, size, PAGE_KERNEL); |
613 | dma_release_from_contiguous(dev, page, size >> PAGE_SHIFT); | 613 | dma_release_from_contiguous(dev, page, size >> PAGE_SHIFT); |
614 | } | 614 | } |
615 | 615 | ||
@@ -1357,7 +1357,7 @@ static void __iommu_free_atomic(struct device *dev, void *cpu_addr, | |||
1357 | static void *arm_iommu_alloc_attrs(struct device *dev, size_t size, | 1357 | static void *arm_iommu_alloc_attrs(struct device *dev, size_t size, |
1358 | dma_addr_t *handle, gfp_t gfp, struct dma_attrs *attrs) | 1358 | dma_addr_t *handle, gfp_t gfp, struct dma_attrs *attrs) |
1359 | { | 1359 | { |
1360 | pgprot_t prot = __get_dma_pgprot(attrs, pgprot_kernel); | 1360 | pgprot_t prot = __get_dma_pgprot(attrs, PAGE_KERNEL); |
1361 | struct page **pages; | 1361 | struct page **pages; |
1362 | void *addr = NULL; | 1362 | void *addr = NULL; |
1363 | 1363 | ||