From 461378e5ae1c47e24efcf47a645ec1e1de7b49b9 Mon Sep 17 00:00:00 2001 From: Andrea Arcangeli Date: Fri, 28 Sep 2012 14:35:31 +0200 Subject: [PATCH] --- yaml --- r: 323211 b: refs/heads/master c: 99a1300e1d84709f419182bb5189760e78234882 h: refs/heads/master i: 323209: 09c0f05d52098087c5144882bab10d6d02c1ca43 323207: 57249df40415fbf0ccb2a77d2a9986386be490c5 v: v3 --- [refs] | 2 +- trunk/mm/huge_memory.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c9c77434541b..5018f55e4c4b 100644 --- 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 index 57c4b9309015..141dbb695097 100644 --- 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