diff options
author | Colin Cross <ccross@android.com> | 2012-05-14 16:41:02 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2012-05-14 16:41:02 -0700 |
commit | ec0b571c19ac62ab0bb80d373a3d4922a48b4b75 (patch) | |
tree | 10c597f5227c969c3f2b909fbeb29725a0c5c6e8 /mm/hugetlb.c | |
parent | 7bb8b65407a519d3a90dd8cecdd1ccd10ee0c6cc (diff) | |
parent | 36be50515fe2aef61533b516fa2576a2c7fe7664 (diff) |
Merge commit 'v3.4-rc7' into android-3.4
Diffstat (limited to 'mm/hugetlb.c')
-rw-r--r-- | mm/hugetlb.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 5a16423a512..ae8f708e3d7 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -2498,7 +2498,6 @@ retry_avoidcopy: 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)); |