diff --git a/[refs] b/[refs] index 078d5b3de863..db604b899272 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 745329c4a2a25efbf5ba6cd7842e07840e4e9775 +refs/heads/master: e5df70ab194543522397fa3da8c8f80564a0f7d3 diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c index cb1b3a7ecdfc..89e6286a7f57 100644 --- a/trunk/mm/hugetlb.c +++ b/trunk/mm/hugetlb.c @@ -120,6 +120,7 @@ static void free_huge_page(struct page *page) struct address_space *mapping; mapping = (struct address_space *) page_private(page); + set_page_private(page, 0); BUG_ON(page_count(page)); INIT_LIST_HEAD(&page->lru); @@ -134,7 +135,6 @@ static void free_huge_page(struct page *page) spin_unlock(&hugetlb_lock); if (mapping) hugetlb_put_quota(mapping, 1); - set_page_private(page, 0); } /*