diff --git a/[refs] b/[refs]
index 9c4898412e4c..940fa1b64de5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0159b141d8b1f9b9f9cffacae47bec1e05c63b8b
+refs/heads/master: 910e46da4b4e93d56ffea318c64afa41868d5e6d
diff --git a/trunk/mm/nommu.c b/trunk/mm/nommu.c
index 00ffa974c90c..2af50831183f 100644
--- a/trunk/mm/nommu.c
+++ b/trunk/mm/nommu.c
@@ -129,16 +129,20 @@ int get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
 	struct page **pages, struct vm_area_struct **vmas)
 {
 	int i;
-	static struct vm_area_struct dummy_vma;
+	struct vm_area_struct *vma;
 
 	for (i = 0; i < len; i++) {
+		vma = find_vma(mm, start);
+		if(!vma)
+			return i ? : -EFAULT;
+
 		if (pages) {
 			pages[i] = virt_to_page(start);
 			if (pages[i])
 				page_cache_get(pages[i]);
 		}
 		if (vmas)
-			vmas[i] = &dummy_vma;
+			vmas[i] = vma;
 		start += PAGE_SIZE;
 	}
 	return(i);