diff options
author | saeed bishara <saeed@marvell.com> | 2011-05-16 10:41:15 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-16 10:42:42 -0400 |
commit | 8373dc38ca8d4918210710807256a313cd111f0b (patch) | |
tree | 72275f4675895890f38d6e98f2d9ee1267ef52f0 | |
parent | 60ba5369135e05f040ea1f6b8130c7b082ed53c8 (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>
-rw-r--r-- | arch/arm/mm/flush.c | 4 |
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) | |||
253 | 253 | ||
254 | if (!test_and_set_bit(PG_dcache_clean, &page->flags)) | 254 | if (!test_and_set_bit(PG_dcache_clean, &page->flags)) |
255 | __flush_dcache_page(mapping, page); | 255 | __flush_dcache_page(mapping, page); |
256 | /* pte_exec() already checked above for non-aliasing VIPT cache */ | 256 | |
257 | if (cache_is_vipt_nonaliasing() || pte_exec(pteval)) | 257 | if (pte_exec(pteval)) |
258 | __flush_icache_all(); | 258 | __flush_icache_all(); |
259 | } | 259 | } |
260 | #endif | 260 | #endif |