aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2009-02-18 00:11:28 -0800
committerJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2009-03-29 23:36:03 -0700
commit252a6bf2a3a7e7add56b17d48aecf3f3ef213103 (patch)
tree78d2cf00c73c4325e024ff00be0bb0f487865859
parent2829b449276aed45f3d649efb21e3418e39dd5d1 (diff)
mm: allow preemption in apply_to_pte_range
Impact: allow preemption in apply_to_pte_range updates to init_mm Preemption is now allowed for lazy mmu mode, so don't disable it for the inner loop of apply_to_pte_range. This only applies when doing updates to init_mm; user pagetables are still modified under the pte lock, so preemption is disabled anyway. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
-rw-r--r--mm/memory.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/mm/memory.c b/mm/memory.c
index b80cc31292b..baa999e87cd 100644
--- a/mm/memory.c
+++ b/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);