diff --git a/[refs] b/[refs] index 15942fe7b47f..34de4ec2775d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1a75a6c825c17249ca49f050a872a04ce0997ce3 +refs/heads/master: 132beacf9785d2e6e8aecb59aa078f3ca5668fa6 diff --git a/trunk/mm/mempolicy.c b/trunk/mm/mempolicy.c index 44b9d69900bc..4c0510e9e7f6 100644 --- a/trunk/mm/mempolicy.c +++ b/trunk/mm/mempolicy.c @@ -259,8 +259,11 @@ static int check_pte_range(struct vm_area_struct *vma, pmd_t *pmd, if (flags & MPOL_MF_STATS) gather_stats(page, private); - else if (flags & (MPOL_MF_MOVE | MPOL_MF_MOVE_ALL)) + else if (flags & (MPOL_MF_MOVE | MPOL_MF_MOVE_ALL)) { + spin_unlock(ptl); migrate_page_add(vma, page, private, flags); + spin_lock(ptl); + } else break; } while (pte++, addr += PAGE_SIZE, addr != end);