diff --git a/[refs] b/[refs]
index 37ab1a82816f..08f24c8cd79f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 488fc08d914f2b07b701c9b9c811437cc1c1c518
+refs/heads/master: a2dfef6947139db9b886fce510c4d0c913beb5f0
diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c
index ceb3ebb3c399..3255ca420fc8 100644
--- a/trunk/mm/hugetlb.c
+++ b/trunk/mm/hugetlb.c
@@ -107,7 +107,7 @@ struct page *alloc_huge_page(struct vm_area_struct *vma, unsigned long addr)
 	set_page_count(page, 1);
 	page[1].mapping = (void *)free_huge_page;
 	for (i = 0; i < (HPAGE_SIZE/PAGE_SIZE); ++i)
-		clear_highpage(&page[i]);
+		clear_user_highpage(&page[i], addr);
 	return page;
 }