From c973de9c05252850fbd86a4e2132874a67538955 Mon Sep 17 00:00:00 2001
From: Hugh Dickins <hugh@veritas.com>
Date: Tue, 29 Nov 2005 16:55:48 +0000
Subject: [PATCH] --- yaml --- r: 14778 b: refs/heads/master c:
 325f04dbca60a4cfe4ac25e7cf246edd07eb4c5f h: refs/heads/master v: v3

---
 [refs]            | 2 +-
 trunk/mm/memory.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0611bc5272ef..2add094841aa 100644
--- 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
index ae259b6e5a21..5bfa52a98630 100644
--- 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;