---

yaml --- r: 164471 b: refs/heads/master c: 1ac0cb5 h: refs/heads/master i: 164469: db04a9e 164467: adf3309 164463: f773c7b v: v3
git-mirror · Sep 22, 2009 · f1ae49a · f1ae49a
1 parent 64cae28
commit f1ae49a
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: 2a15efc953b26ad57d7d38b9e6782d57e53b4ab2
+refs/heads/master: 1ac0cb5d0e22d5e483f56b2bc12172dec1cf7536
diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c
@@ -2653,7 +2653,8 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
 		goto oom_free_page;
 
 	entry = mk_pte(page, vma->vm_page_prot);
-	entry = maybe_mkwrite(pte_mkdirty(entry), vma);
+	if (vma->vm_flags & VM_WRITE)
+		entry = pte_mkwrite(pte_mkdirty(entry));
 
 	page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
 	if (!pte_none(*page_table))