X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=mm%2Fmremap.c;h=5d4bd4f95b8e5ef28f269f604b61d133f341d27b;hb=a2bbd0c923708a23c6fcc6bbc492f2eecadc676f;hp=1903bdf65e428d88e5bf124243d99ee7ab7c51e3;hpb=292dd876ee765c478b27c93cc51e93a558ed58bf;p=powerpc.git

diff --git a/mm/mremap.c b/mm/mremap.c
index 1903bdf65e..5d4bd4f95b 100644
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -97,18 +97,19 @@ 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);
+	arch_enter_lazy_mmu_mode();
 
 	for (; old_addr < old_end; old_pte++, old_addr += PAGE_SIZE,
 				   new_pte++, new_addr += PAGE_SIZE) {
 		if (pte_none(*old_pte))
 			continue;
 		pte = ptep_clear_flush(vma, old_addr, old_pte);
-		/* ZERO_PAGE can be dependant on virtual addr */
 		pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
 		set_pte_at(mm, new_addr, new_pte, pte);
 	}
 
+	arch_leave_lazy_mmu_mode();
 	if (new_ptl != old_ptl)
 		spin_unlock(new_ptl);
 	pte_unmap_nested(new_pte - 1);