---

yaml --- r: 145815 b: refs/heads/master c: 252a6bf h: refs/heads/master i: 145813: 4b33aeb 145811: 183bc5f 145807: 9d55383 v: v3
git-mirror · Mar 30, 2009 · 1ebc8b6 · 1ebc8b6
1 parent be00e14
commit 1ebc8b6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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);