From f021cc1e94c74ae8b0d02b319640b106b9b911f9 Mon Sep 17 00:00:00 2001 From: Minchan Kim Date: Mon, 8 Oct 2012 16:33:38 -0700 Subject: [PATCH] --- yaml --- r: 332463 b: refs/heads/master c: 082708072a4250f5c4dbc62065e7af93f5e45646 h: refs/heads/master i: 332461: 84222050f2939fe951b2ee786c0d07190fe02037 332459: d11a9ca6c206cc0670c07e0edce859b5f4d4bdd2 332455: f61831d69ab23374fe243ac7c9cd0c9630c98df6 332447: b87d1276adc45d0b333d2a6fe30641973e4e3978 v: v3 --- [refs] | 2 +- trunk/mm/mempolicy.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index cf7ce23c3443..176bd888aec3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6bdb913f0a70a4dfb7f066fb15e2d6f960701d00 +refs/heads/master: 082708072a4250f5c4dbc62065e7af93f5e45646 diff --git a/trunk/mm/mempolicy.c b/trunk/mm/mempolicy.c index 3d64b369180d..0b78fb9ea65b 100644 --- a/trunk/mm/mempolicy.c +++ b/trunk/mm/mempolicy.c @@ -946,15 +946,18 @@ 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); - vma = check_range(mm, mm->mmap->vm_start, mm->task_size, &nmask, + /* + * This does not "check" the range but isolates all pages that + * need migration. Between passing in the full user address + * space range and MPOL_MF_DISCONTIG_OK, this call can not fail. + */ + VM_BUG_ON(!(flags & (MPOL_MF_MOVE | MPOL_MF_MOVE_ALL))); + 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,