Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

[karo-tx-linux.git] / mm / mremap.c

diff --git a/mm/mremap.c b/mm/mremap.c
index 1903bdf65e428d88e5bf124243d99ee7ab7c51e3..7c15cf3373ad0d0e94ba6f5b74145339da0052d3 100644 (file)
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -97,7 +97,7 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
        new_pte = pte_offset_map_nested(new_pmd, new_addr);
        new_ptl = pte_lockptr(mm, new_pmd);
        if (new_ptl != old_ptl)
-               spin_lock(new_ptl);
+               spin_lock_nested(new_ptl, SINGLE_DEPTH_NESTING);
 
        for (; old_addr < old_end; old_pte++, old_addr += PAGE_SIZE,
                                   new_pte++, new_addr += PAGE_SIZE) {