From 1ebc8b6ddf3447f052bfe13de4a01efdba74dccd Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Wed, 18 Feb 2009 00:11:28 -0800 Subject: [PATCH] --- yaml --- r: 145815 b: refs/heads/master c: 252a6bf2a3a7e7add56b17d48aecf3f3ef213103 h: refs/heads/master i: 145813: 4b33aeb38b8320caeb9045811e0260b283cd0740 145811: 183bc5fffe336dcc96834146603dc48e4c5870b6 145807: 9d55383e39913f9beda5a3b7e757baa8cd5fd259 v: v3 --- [refs] | 2 +- trunk/mm/memory.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) 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);