summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorsaeed bishara <saeed@marvell.com>2011-05-16 15:41:15 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-05-16 15:42:42 +0100
commit8373dc38ca8d4918210710807256a313cd111f0b (patch)
tree72275f4675895890f38d6e98f2d9ee1267ef52f0 /arch/arm
parent60ba5369135e05f040ea1f6b8130c7b082ed53c8 (diff)
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>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mm/flush.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mm/flush.c b/arch/arm/mm/flush.c
index 2b269c955524..f1b799802858 100644
--- a/arch/arm/mm/flush.c
+++ b/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))
__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();
}
#endif