summaryrefslogtreecommitdiffstats
path: root/mm/mempolicy.c
diff options
context:
space:
mode:
authorChristoph Lameter2006-01-08 10:01:02 +0100
committerLinus Torvalds2006-01-09 05:12:44 +0100
commit132beacf9785d2e6e8aecb59aa078f3ca5668fa6 (patch)
tree7b1274279448e4fde20489b7572455ef93bc4c3d /mm/mempolicy.c
parent[PATCH] Fold numa_maps into mempolicies.c (diff)
downloadkernel-qcow2-linux-132beacf9785d2e6e8aecb59aa078f3ca5668fa6.tar.gz
kernel-qcow2-linux-132beacf9785d2e6e8aecb59aa078f3ca5668fa6.tar.xz
kernel-qcow2-linux-132beacf9785d2e6e8aecb59aa078f3ca5668fa6.zip
[PATCH] Drop page table lock before calling migrate_page_add()
migrate_page_add cannot be called with a spinlock held (calls isolate_lru_page which calles schedule_on_each_cpu). Drop ptl lock in check_pte_range before calling migrate_page_add(). Signed-off-by: Christoph Lameter <clameter@sgi.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm/mempolicy.c')
-rw-r--r--mm/mempolicy.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 44b9d69900bc..4c0510e9e7f6 100644
--- a/mm/mempolicy.c
+++ b/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);