Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84ab1e55 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dma-mapping: don't allow DMA mappings to be marked executable"

parents 3994b828 aa039778

arch/arm/mm/dma-mapping.c

+2 −2
Original line number Diff line number Diff line
@@ -762,7 +762,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;

	bool no_kernel_mapping = dma_get_attr(DMA_ATTR_NO_KERNEL_MAPPING,

					attrs);
@@ -777,7 +777,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;

	bool no_kernel_mapping = dma_get_attr(DMA_ATTR_NO_KERNEL_MAPPING,

					attrs);