From 6af35bf5976c9c1b611ece0806bf1994a92e3598 Mon Sep 17 00:00:00 2001
From: Stuart Menefy <stuart.menefy@st.com>
Date: Mon, 31 Jan 2011 17:50:29 +0000
Subject: [PATCH] --- yaml --- r: 233901 b: refs/heads/master c:
 a25bbe12224e649fe12cba7a2fa920180a35c8a9 h: refs/heads/master i:   233899:
 c70b4c80b650fb88ab77527e21514b546f48ed27 v: v3

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

diff --git a/[refs] b/[refs]
index 5cf443a78ae3..33013b586f63 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a086536858ad0eb51c58074af2fc2c89ba9c1f5e
+refs/heads/master: a25bbe12224e649fe12cba7a2fa920180a35c8a9
diff --git a/trunk/arch/sh/mm/cache.c b/trunk/arch/sh/mm/cache.c
index 88d3dc3d30d5..5a580ea04429 100644
--- a/trunk/arch/sh/mm/cache.c
+++ b/trunk/arch/sh/mm/cache.c
@@ -108,7 +108,8 @@ void copy_user_highpage(struct page *to, struct page *from,
 		kunmap_atomic(vfrom, KM_USER0);
 	}
 
-	if (pages_do_alias((unsigned long)vto, vaddr & PAGE_MASK))
+	if (pages_do_alias((unsigned long)vto, vaddr & PAGE_MASK) ||
+	    (vma->vm_flags & VM_EXEC))
 		__flush_purge_region(vto, PAGE_SIZE);
 
 	kunmap_atomic(vto, KM_USER1);