From beb8dd08e534d120a1b6e83ade0abe0a330b4616 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 12 Dec 2005 16:24:33 -0800
Subject: [PATCH] --- yaml --- r: 15069 b: refs/heads/master c:
 1ff8038988adecfde71d82c0597727fc239d4e8c h: refs/heads/master i:   15067:
 7a366112d91601f2a9692fae75b1c135c687f042 v: v3

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

diff --git a/[refs] b/[refs]
index dc9ea9e0a67e..52a7f640e18a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14ee0a1414536d27bc29373bf23c106b8ef8ce0b
+refs/heads/master: 1ff8038988adecfde71d82c0597727fc239d4e8c
diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c
index 47c533eaa072..d22f78c8a381 100644
--- a/trunk/mm/memory.c
+++ b/trunk/mm/memory.c
@@ -1009,7 +1009,7 @@ int get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
 			continue;
 		}
 
-		if (!vma || (vma->vm_flags & VM_IO)
+		if (!vma || (vma->vm_flags & (VM_IO | VM_PFNMAP))
 				|| !(vm_flags & vma->vm_flags))
 			return i ? : -EFAULT;