---

yaml --- r: 233901 b: refs/heads/master c: a25bbe1 h: refs/heads/master i: 233899: c70b4c8 v: v3
git-mirror · Feb 15, 2011 · 6af35bf · 6af35bf
1 parent 8f9a3e6
commit 6af35bf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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);