---

yaml --- r: 332486 b: refs/heads/master c: f5c8ad4 h: refs/heads/master v: v3
git-mirror · Oct 9, 2012 · 9b277eb · 9b277eb
1 parent 244a796
commit 9b277eb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b113da65785d5f3f9ff1451ec0fe43d6d76da25b
+refs/heads/master: f5c8ad47284ca01dafc37da5a72bb9644174d387
diff --git a/trunk/mm/huge_memory.c b/trunk/mm/huge_memory.c
@@ -1024,9 +1024,10 @@ int zap_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma,
 	if (__pmd_trans_huge_lock(pmd, vma) == 1) {
 		struct page *page;
 		pgtable_t pgtable;
+		pmd_t orig_pmd;
 		pgtable = pgtable_trans_huge_withdraw(tlb->mm);
-		page = pmd_page(*pmd);
-		pmd_clear(pmd);
+		orig_pmd = pmdp_get_and_clear(tlb->mm, addr, pmd);
+		page = pmd_page(orig_pmd);
 		tlb_remove_pmd_tlb_entry(tlb, pmd, addr);
 		page_remove_rmap(page);
 		VM_BUG_ON(page_mapcount(page) < 0);