---

yaml --- r: 323211 b: refs/heads/master c: 99a1300 h: refs/heads/master i: 323209: 09c0f05 323207: 57249df v: v3
git-mirror · Sep 28, 2012 · 461378e · 461378e
1 parent 7ce61a7
commit 461378e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 63994137eb53bb0fc42ad180c0ce509d3eb3bdc9
+refs/heads/master: 99a1300e1d84709f419182bb5189760e78234882
diff --git a/trunk/mm/huge_memory.c b/trunk/mm/huge_memory.c
@@ -1811,7 +1811,6 @@ static void __collapse_huge_page_copy(pte_t *pte, struct page *page,
 			src_page = pte_page(pteval);
 			copy_user_highpage(page, src_page, address, vma);
 			VM_BUG_ON(page_mapcount(src_page) != 1);
-			VM_BUG_ON(page_count(src_page) != 2);
 			release_pte_page(src_page);
 			/*
 			 * ptl mostly unnecessary, but preempt has to