Browse Source

ARM: 6901/1: remove unneeded check of the cache_is_vipt_nonaliasing()

when cache_is_vipt_nonaliasing(), we always have pte_exec() true at
the end of this function, so no need for the additional check.

Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Saeed Bishara <saeed@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
saeed bishara 14 years ago
parent
commit
8373dc38ca
1 changed files with 2 additions and 2 deletions
  1. 2 2
      arch/arm/mm/flush.c

+ 2 - 2
arch/arm/mm/flush.c

@@ -253,8 +253,8 @@ void __sync_icache_dcache(pte_t pteval)
 
 
 	if (!test_and_set_bit(PG_dcache_clean, &page->flags))
 	if (!test_and_set_bit(PG_dcache_clean, &page->flags))
 		__flush_dcache_page(mapping, page);
 		__flush_dcache_page(mapping, page);
-	/* pte_exec() already checked above for non-aliasing VIPT cache */
-	if (cache_is_vipt_nonaliasing() || pte_exec(pteval))
+
+	if (pte_exec(pteval))
 		__flush_icache_all();
 		__flush_icache_all();
 }
 }
 #endif
 #endif