aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2009-10-24 18:05:34 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-12-04 09:58:50 -0500
commitf91fb05d826a43063fa0aa2ec30c23d3993a208d (patch)
tree9ada5aefa09d40b70ea3b8a5e89d7ce6aa2a5fd9
parent2df341edf6b8a2db7f414d00faeadccbdd9844ab (diff)
ARM: Remove __flush_icache_all() from __flush_dcache_page()
Both call sites for __flush_dcache_page() end up calling __flush_icache_all() themselves, so having __flush_dcache_page() do this as well is wasteful. Remove the duplicated icache flushing. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mm/flush.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mm/flush.c b/arch/arm/mm/flush.c
index 302d66517488..dc66f867bec4 100644
--- a/arch/arm/mm/flush.c
+++ b/arch/arm/mm/flush.c
@@ -134,11 +134,9 @@ void __flush_dcache_page(struct address_space *mapping, struct page *page)
134 * we only need to do one flush - which would be at the relevant 134 * we only need to do one flush - which would be at the relevant
135 * userspace colour, which is congruent with page->index. 135 * userspace colour, which is congruent with page->index.
136 */ 136 */
137 if (mapping && cache_is_vipt_aliasing()) { 137 if (mapping && cache_is_vipt_aliasing())
138 flush_pfn_alias(page_to_pfn(page), 138 flush_pfn_alias(page_to_pfn(page),
139 page->index << PAGE_CACHE_SHIFT); 139 page->index << PAGE_CACHE_SHIFT);
140 __flush_icache_all();
141 }
142} 140}
143 141
144static void __flush_dcache_aliases(struct address_space *mapping, struct page *page) 142static void __flush_dcache_aliases(struct address_space *mapping, struct page *page)