aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-07-25 12:59:32 +0100
committerMark Brown <broonie@linaro.org>2014-07-25 12:59:32 +0100
commit4a9948e4921af4c4b6a9f1120b9a05122957d09d (patch)
tree77f00bc672fe2b18183518fda089f553e8773ef9
parent108212d3384e981273049b8d007edcf612f1eda4 (diff)
parenta95eca36ffbf8891d1e1a20d5c4a237f6d8f6a1f (diff)
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsklsk-v3.10-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();