---

yaml --- r: 217449 b: refs/heads/master c: 0def08e h: refs/heads/master i: 217447: 4f9518e v: v3
git-mirror · Oct 26, 2010 · e609981 · e609981
1 parent 9263e9b
commit e609981
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74e3f3c3391d81a959f58a1191a560703a4415b4
+refs/heads/master: 0def08e3acc2c9c934e4671487029aed52202d42
diff --git a/trunk/mm/mempolicy.c b/trunk/mm/mempolicy.c
@@ -924,12 +924,15 @@ static int migrate_to_node(struct mm_struct *mm, int source, int dest,
 	nodemask_t nmask;
 	LIST_HEAD(pagelist);
 	int err = 0;
+	struct vm_area_struct *vma;
 
 	nodes_clear(nmask);
 	node_set(source, nmask);
 
-	check_range(mm, mm->mmap->vm_start, mm->task_size, &nmask,
+	vma = check_range(mm, mm->mmap->vm_start, mm->task_size, &nmask,
 			flags | MPOL_MF_DISCONTIG_OK, &pagelist);
+	if (IS_ERR(vma))
+		return PTR_ERR(vma);
 
 	if (!list_empty(&pagelist)) {
 		err = migrate_pages(&pagelist, new_node_page, dest, 0);