From 74aaa3aedbfe377306e164d4254f0f38f6a0400b Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sun, 25 Oct 2009 14:12:27 +0000
Subject: [PATCH] --- yaml --- r: 172391 b: refs/heads/master c:
 6060e8df517847bf445ebc61de7d4d9c7faae990 h: refs/heads/master i:   172389:
 2bcbc37273baaf4fc4ea2129d7693d68cd68ef56   172387:
 f4c98cd3c2728dc8fac4bd80938cfd4f1fa3d182   172383:
 698488a629b7dea237140a26a3b94aad1c93cbee v: v3

---
 [refs]                    | 2 +-
 trunk/arch/arm/mm/flush.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5a0c83bb8ae6..604aaaadf5bb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea201dbb78651c71c56e440b8b3132906bc7456d
+refs/heads/master: 6060e8df517847bf445ebc61de7d4d9c7faae990
diff --git a/trunk/arch/arm/mm/flush.c b/trunk/arch/arm/mm/flush.c
index f8feb5d919fe..329594e760cd 100644
--- a/trunk/arch/arm/mm/flush.c
+++ b/trunk/arch/arm/mm/flush.c
@@ -66,10 +66,9 @@ void flush_cache_range(struct vm_area_struct *vma, unsigned long start, unsigned
 		    :
 		    : "r" (0)
 		    : "cc");
-		__flush_icache_all();
 	}
 
-	if (vma->vm_flags & VM_EXEC && icache_is_vivt_asid_tagged())
+	if (vma->vm_flags & VM_EXEC)
 		__flush_icache_all();
 }