aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-07-25 12:59:39 +0100
committerMark Brown <broonie@linaro.org>2014-07-25 12:59:39 +0100
commit1df5f2728eb1ba0f7b783c00afe7575902996d39 (patch)
tree08af1b1f0c4e8b446905739b0cd5f2e32be7d1c0
parent0858f0fb2659fbbf2832922255a695b26613b781 (diff)
parent4a9948e4921af4c4b6a9f1120b9a05122957d09d (diff)
downloadlinux-linaro-stable-1df5f2728eb1ba0f7b783c00afe7575902996d39.tar.gz
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-androidlsk-v3.10-android-14.07
-rw-r--r--arch/arm64/mm/flush.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/mm/flush.c b/arch/arm64/mm/flush.c
index e4193e3adc7f..0d64089d28b5 100644
--- a/arch/arm64/mm/flush.c
+++ b/arch/arm64/mm/flush.c
@@ -79,7 +79,8 @@ void __sync_icache_dcache(pte_t pte, unsigned long addr)
return;
if (!test_and_set_bit(PG_dcache_clean, &page->flags)) {
- __flush_dcache_area(page_address(page), PAGE_SIZE);
+ __flush_dcache_area(page_address(page),
+ PAGE_SIZE << compound_order(page));
__flush_icache_all();
} else if (icache_is_aivivt()) {
__flush_icache_all();