diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-11-10 22:49:36 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-11-10 22:49:35 -0800 |
| commit | de9acd7e8f04db8e3ccf775ae6347776f26138a1 (patch) | |
| tree | aa894b31db02c5d0149b52a86401122da4593699 | |
| parent | c2183620eabe1a3df05f37d3e3ca5756a1c672a4 (diff) | |
| parent | adcf23cfd50ad6fe1df98646302706ae03ec4f1b (diff) | |
Merge "arm: dma-mapping: page align size before flush tlb"
| -rw-r--r-- | arch/arm/mm/dma-mapping.c | 1 | ||||
| -rw-r--r-- | arch/arm64/mm/dma-mapping.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index 369fca73a9ab..80c4c50814d8 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -807,6 +807,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); diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index 07c67348b815..df083e9350c4 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c @@ -455,6 +455,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); |