summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Brand <cbrand@broadcom.com>2012-08-07 14:01:14 +0200
committerMarek Szyprowski <m.szyprowski@samsung.com>2012-08-09 07:46:07 +0200
commit39f78e70567a07a6fc0d7a4ca9e3331e44dd400d (patch)
treefa912fcd3cd9cb6fe0af7b9d413b3ff38fb595eb
parent0d7614f09c1ebdbaa1599a5aba7593f147bf96ee (diff)
downloadlinux-39f78e70567a07a6fc0d7a4ca9e3331e44dd400d.tar.bz2
ARM: mm: fix MMU mapping of CMA regions
Fix dma_contiguous_remap() so that it continues through all the regions, even after encountering one that is outside lowmem. Without this change, if you have two CMA regions, the first outside lowmem and the seocnd inside lowmem, only the second one will get set up in the MMU. Data written to that region then doesn't get automatically flushed from the cache into memory. Signed-off-by: Chris Brand <cbrand@broadcom.com> [extended patch subject with 'fix' word] Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
-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 c2cdf6500f75..334dd79ad5e6 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -358,7 +358,7 @@ void __init dma_contiguous_remap(void)
if (end > arm_lowmem_limit)
end = arm_lowmem_limit;
if (start >= end)
- return;
+ continue;
map.pfn = __phys_to_pfn(start);
map.virtual = __phys_to_virt(start);