Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 1 insertions, 1 deletions

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index cb1b3a7ecdfc..89e6286a7f57 100644
--- a/mm/hugetlb.c
+++ b/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);
 }
 
 /*