---

yaml --- r: 14778 b: refs/heads/master c: 325f04d h: refs/heads/master v: v3
git-mirror · Nov 29, 2005 · c973de9 · c973de9
1 parent 20008f4
commit c973de9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e5bbe4dfc8dbfc50ef89f8641e020616d4d1e69e
+refs/heads/master: 325f04dbca60a4cfe4ac25e7cf246edd07eb4c5f
diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c
@@ -2009,6 +2009,8 @@ static int do_no_page(struct mm_struct *mm, struct vm_area_struct *vma,
 	int anon = 0;
 
 	pte_unmap(page_table);
+	BUG_ON(vma->vm_flags & VM_PFNMAP);
+
 	if (vma->vm_file) {
 		mapping = vma->vm_file->f_mapping;
 		sequence = mapping->truncate_count;
@@ -2041,7 +2043,7 @@ static int do_no_page(struct mm_struct *mm, struct vm_area_struct *vma,
 		page = alloc_page_vma(GFP_HIGHUSER, vma, address);
 		if (!page)
 			goto oom;
-		cow_user_page(page, new_page, address);
+		copy_user_highpage(page, new_page, address);
 		page_cache_release(new_page);
 		new_page = page;
 		anon = 1;