From 81a4450d8fd707eb8f99f658a08f9a850469091e Mon Sep 17 00:00:00 2001
From: Chris Metcalf <cmetcalf@tilera.com>
Date: Thu, 10 May 2012 13:01:44 -0700
Subject: [PATCH] --- yaml --- r: 300153 b: refs/heads/master c:
 4998a6c0edce7fae9c0a5463f6ec3fa585258ee7 h: refs/heads/master i:   300151:
 3bbbe6801a5eea5a28db314b0f7f0f99a93255bd v: v3

---
 [refs]             | 2 +-
 trunk/mm/hugetlb.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9af42b61c423..9bc990c6f223 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93278814d3590eba0ee360b8d69a35c7f2203ea8
+refs/heads/master: 4998a6c0edce7fae9c0a5463f6ec3fa585258ee7
diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c
index 5a16423a512c..ae8f708e3d75 100644
--- a/trunk/mm/hugetlb.c
+++ b/trunk/mm/hugetlb.c
@@ -2498,7 +2498,6 @@ static int hugetlb_cow(struct mm_struct *mm, struct vm_area_struct *vma,
 		if (outside_reserve) {
 			BUG_ON(huge_pte_none(pte));
 			if (unmap_ref_private(mm, vma, old_page, address)) {
-				BUG_ON(page_count(old_page) != 1);
 				BUG_ON(huge_pte_none(pte));
 				spin_lock(&mm->page_table_lock);
 				ptep = huge_pte_offset(mm, address & huge_page_mask(h));