diff options
| author | Steven Capper <steve.capper@linaro.org> | 2013-12-16 17:25:52 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-01-15 15:31:40 -0800 |
| commit | 8c3d0f1f021aca05e1ba4ff47c7231c2d7ef95fe (patch) | |
| tree | 2a5a6c139b33a4eb5c518d751e8b90118411884e /arch | |
| parent | 26009d653408c3dd058c3b64fd01e2020cc052f2 (diff) | |
| download | kernel-common-8c3d0f1f021aca05e1ba4ff47c7231c2d7ef95fe.tar.gz kernel-common-8c3d0f1f021aca05e1ba4ff47c7231c2d7ef95fe.tar.bz2 kernel-common-8c3d0f1f021aca05e1ba4ff47c7231c2d7ef95fe.zip | |
ARM: 7923/1: mm: fix dcache flush logic for compound high pages
commit 2a7cfcbc0553365d75716f69ee7b704cac7c9248 upstream.
When given a compound high page, __flush_dcache_page will only flush
the first page of the compound page repeatedly rather than the entire
set of constituent pages.
This error was introduced by:
0b19f93 ARM: mm: Add support for flushing HugeTLB pages.
This patch corrects the logic such that all constituent pages are now
flushed.
Signed-off-by: Steve Capper <steve.capper@linaro.org>
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mm/flush.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mm/flush.c b/arch/arm/mm/flush.c index 6d5ba9afb16a..3387e60e4ea3 100644 --- a/arch/arm/mm/flush.c +++ b/arch/arm/mm/flush.c @@ -175,16 +175,16 @@ void __flush_dcache_page(struct address_space *mapping, struct page *page) unsigned long i; if (cache_is_vipt_nonaliasing()) { for (i = 0; i < (1 << compound_order(page)); i++) { - void *addr = kmap_atomic(page); + void *addr = kmap_atomic(page + i); __cpuc_flush_dcache_area(addr, PAGE_SIZE); kunmap_atomic(addr); } } else { for (i = 0; i < (1 << compound_order(page)); i++) { - void *addr = kmap_high_get(page); + void *addr = kmap_high_get(page + i); if (addr) { __cpuc_flush_dcache_area(addr, PAGE_SIZE); - kunmap_high(page); + kunmap_high(page + i); } } } |