From: saeed bishara <saeed@marvell.com>
Date: Mon, 16 May 2011 14:41:15 +0000 (+0100)
Subject: ARM: 6901/1: remove unneeded check of the cache_is_vipt_nonaliasing()
X-Git-Tag: v3.0-rc1~328^2~1^4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8373dc38ca8d4918210710807256a313cd111f0b;p=profile%2Fivi%2Fkernel-x86-ivi.git

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>
---

diff --git a/arch/arm/mm/flush.c b/arch/arm/mm/flush.c
index 2b269c9..f1b7998 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