[PATCH] ioremap balanced with iounmap for drivers/video/vesafb

[sfrench/cifs-2.6.git] / mm / mremap.c

diff --git a/mm/mremap.c b/mm/mremap.c
index 1903bdf65e428d88e5bf124243d99ee7ab7c51e3..9c769fa29f32aff451ef6ff86ce836c1fc0bf856 100644 (file)
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -97,7 +97,8 @@ 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) {
@@ -109,6 +110,7 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
                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);