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

Commit a4a40e08 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: page align size before flush tlb"

parents d815666f 0a744a4c

arch/arm/mm/dma-mapping.c

+1 −0
Original line number Diff line number Diff line
@@ -808,6 +808,7 @@ static void arm_dma_unremap(struct device *dev, void *remapped_addr, 
	unsigned int flags = VM_ARM_DMA_CONSISTENT | VM_USERMAP;

	struct vm_struct *area;



	size = PAGE_ALIGN(size);

	remapped_addr = (void *)((unsigned long)remapped_addr & PAGE_MASK);



	area = find_vm_area(remapped_addr);

arch/arm64/mm/dma-mapping.c

+1 −0
Original line number Diff line number Diff line
@@ -448,6 +448,7 @@ static void arm64_dma_unremap(struct device *dev, void *remapped_addr, 
{

	struct vm_struct *area;



	size = PAGE_ALIGN(size);

	remapped_addr = (void *)((unsigned long)remapped_addr & PAGE_MASK);



	area = find_vm_area(remapped_addr);