---

yaml --- r: 6863 b: refs/heads/master c: 9a61c34 h: refs/heads/master i: 6861: 96b6e6e 6859: 08b7af5 6855: 67c37ef 6847: 079764d v: v3
git-mirror · Sep 5, 2005 · 08505f3 · 08505f3
1 parent dfaffb3
commit 08505f3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4d7670e0f649f9e6e6ea6c8bb9f52441fa00f92b
+refs/heads/master: 9a61c349b28ec5aef7e929236571fd770fdef0bb
diff --git a/trunk/mm/mremap.c b/trunk/mm/mremap.c
@@ -141,6 +141,10 @@ move_one_page(struct vm_area_struct *vma, unsigned long old_addr,
 			if (dst) {
 				pte_t pte;
 				pte = ptep_clear_flush(vma, old_addr, src);
+				/* ZERO_PAGE can be dependant on virtual addr */
+				if (pfn_valid(pte_pfn(pte)) &&
+					pte_page(pte) == ZERO_PAGE(old_addr))
+					pte = pte_wrprotect(mk_pte(ZERO_PAGE(new_addr), new_vma->vm_page_prot));
 				set_pte_at(mm, new_addr, dst, pte);
 			} else
 				error = -ENOMEM;