diff --git a/[refs] b/[refs]
index c6bd29c56ddb..e1924f5874e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6999b19120931ede364fa3b685e698a61fed31d
+refs/heads/master: 58a84aa92723d1ac3e1cc4e3b0ff49291663f7e1
diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c
index bb28a5f9db8d..73f17c0293c0 100644
--- a/trunk/mm/hugetlb.c
+++ b/trunk/mm/hugetlb.c
@@ -576,6 +576,7 @@ static void prep_compound_gigantic_page(struct page *page, unsigned long order)
 	__SetPageHead(page);
 	for (i = 1; i < nr_pages; i++, p = mem_map_next(p, page, i)) {
 		__SetPageTail(p);
+		set_page_count(p, 0);
 		p->first_page = page;
 	}
 }
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index 9dd443d89d8b..850009a7101e 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -356,8 +356,8 @@ void prep_compound_page(struct page *page, unsigned long order)
 	__SetPageHead(page);
 	for (i = 1; i < nr_pages; i++) {
 		struct page *p = page + i;
-
 		__SetPageTail(p);
+		set_page_count(p, 0);
 		p->first_page = page;
 	}
 }