diff --git a/[refs] b/[refs] index dcd6de5abb40..ab554e5ec142 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2829b449276aed45f3d649efb21e3418e39dd5d1 +refs/heads/master: 252a6bf2a3a7e7add56b17d48aecf3f3ef213103 diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c index b80cc31292b1..baa999e87cd2 100644 --- a/trunk/mm/memory.c +++ b/trunk/mm/memory.c @@ -1718,7 +1718,6 @@ static int apply_to_pte_range(struct mm_struct *mm, pmd_t *pmd, BUG_ON(pmd_huge(*pmd)); - preempt_disable(); arch_enter_lazy_mmu_mode(); token = pmd_pgtable(*pmd); @@ -1730,7 +1729,6 @@ static int apply_to_pte_range(struct mm_struct *mm, pmd_t *pmd, } while (pte++, addr += PAGE_SIZE, addr != end); arch_leave_lazy_mmu_mode(); - preempt_enable(); if (mm != &init_mm) pte_unmap_unlock(pte-1, ptl);