summaryrefslogtreecommitdiff
path: root/arch/arm/mm
diff options
context:
space:
mode:
authorVitaly Andrianov <vitalya@ti.com>2012-05-14 13:49:56 -0400
committerMarek Szyprowski <m.szyprowski@samsung.com>2012-05-21 15:09:40 +0200
commit61f6c7a47a2f84b7ba4b65240ffe9247df772b06 (patch)
treeaaeadf6490c61a541f83c86374e87a69384b2ca5 /arch/arm/mm
parent58f42fd54144346898e6dc6d6ae3acd4c591b42f (diff)
downloadlinux-3.10-61f6c7a47a2f84b7ba4b65240ffe9247df772b06.tar.gz
linux-3.10-61f6c7a47a2f84b7ba4b65240ffe9247df772b06.tar.bz2
linux-3.10-61f6c7a47a2f84b7ba4b65240ffe9247df772b06.zip
ARM: dma-mapping: use PMD size for section unmap
The dma_contiguous_remap() function clears existing section maps using the wrong size (PGDIR_SIZE instead of PMD_SIZE). This is a bug which does not affect non-LPAE systems, where PGDIR_SIZE and PMD_SIZE are the same. On LPAE systems, however, this bug causes the kernel to hang at this point. This fix has been tested on both LPAE and non-LPAE kernel builds. Signed-off-by: Vitaly Andrianov <vitalya@ti.com> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Diffstat (limited to 'arch/arm/mm')
-rw-r--r--arch/arm/mm/dma-mapping.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index 302f5bfb17f..153f5559406 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -295,7 +295,7 @@ void __init dma_contiguous_remap(void)
* Clear previous low-memory mapping
*/
for (addr = __phys_to_virt(start); addr < __phys_to_virt(end);
- addr += PGDIR_SIZE)
+ addr += PMD_SIZE)
pmd_clear(pmd_off_k(addr));
iotable_init(&map, 1);