diff options
author | Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> | 2009-02-18 03:11:28 -0500 |
---|---|---|
committer | Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> | 2009-03-30 02:36:03 -0400 |
commit | 252a6bf2a3a7e7add56b17d48aecf3f3ef213103 (patch) | |
tree | 78d2cf00c73c4325e024ff00be0bb0f487865859 | |
parent | 2829b449276aed45f3d649efb21e3418e39dd5d1 (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.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mm/memory.c b/mm/memory.c index b80cc31292b1..baa999e87cd2 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, | |||
1718 | 1718 | ||
1719 | BUG_ON(pmd_huge(*pmd)); | 1719 | BUG_ON(pmd_huge(*pmd)); |
1720 | 1720 | ||
1721 | preempt_disable(); | ||
1722 | arch_enter_lazy_mmu_mode(); | 1721 | arch_enter_lazy_mmu_mode(); |
1723 | 1722 | ||
1724 | token = pmd_pgtable(*pmd); | 1723 | token = pmd_pgtable(*pmd); |
@@ -1730,7 +1729,6 @@ static int apply_to_pte_range(struct mm_struct *mm, pmd_t *pmd, | |||
1730 | } while (pte++, addr += PAGE_SIZE, addr != end); | 1729 | } while (pte++, addr += PAGE_SIZE, addr != end); |
1731 | 1730 | ||
1732 | arch_leave_lazy_mmu_mode(); | 1731 | arch_leave_lazy_mmu_mode(); |
1733 | preempt_enable(); | ||
1734 | 1732 | ||
1735 | if (mm != &init_mm) | 1733 | if (mm != &init_mm) |
1736 | pte_unmap_unlock(pte-1, ptl); | 1734 | pte_unmap_unlock(pte-1, ptl); |