|
|
@@ -687,7 +687,7 @@ static void *__dma_alloc(struct device *dev, size_t size, dma_addr_t *handle,
|
|
|
void *arm_dma_alloc(struct device *dev, size_t size, dma_addr_t *handle,
|
|
|
gfp_t gfp, struct dma_attrs *attrs)
|
|
|
{
|
|
|
- pgprot_t prot = __get_dma_pgprot(attrs, pgprot_kernel);
|
|
|
+ pgprot_t prot = __get_dma_pgprot(attrs, PAGE_KERNEL);
|
|
|
void *memory;
|
|
|
|
|
|
if (dma_alloc_from_coherent(dev, size, handle, &memory))
|
|
|
@@ -700,7 +700,7 @@ void *arm_dma_alloc(struct device *dev, size_t size, dma_addr_t *handle,
|
|
|
static void *arm_coherent_dma_alloc(struct device *dev, size_t size,
|
|
|
dma_addr_t *handle, gfp_t gfp, struct dma_attrs *attrs)
|
|
|
{
|
|
|
- pgprot_t prot = __get_dma_pgprot(attrs, pgprot_kernel);
|
|
|
+ pgprot_t prot = __get_dma_pgprot(attrs, PAGE_KERNEL);
|
|
|
void *memory;
|
|
|
|
|
|
if (dma_alloc_from_coherent(dev, size, handle, &memory))
|