diff --git a/[refs] b/[refs]
index 00edecda4233..37e8f785bafc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f672b49b07a4a152fc4251f2aec6b4d05164c4cd
+refs/heads/master: 3ef8fd7f720fc4f462fcdcae2fcde6f1c0536bfe
diff --git a/trunk/mm/migrate.c b/trunk/mm/migrate.c
index 55dbc45880c6..f8c9bccf2520 100644
--- a/trunk/mm/migrate.c
+++ b/trunk/mm/migrate.c
@@ -139,8 +139,10 @@ static int remove_migration_pte(struct page *new, struct vm_area_struct *vma,
 	pte = pte_mkold(mk_pte(new, vma->vm_page_prot));
 	if (is_write_migration_entry(entry))
 		pte = pte_mkwrite(pte);
+#ifdef CONFIG_HUGETLB_PAGE
 	if (PageHuge(new))
 		pte = pte_mkhuge(pte);
+#endif
 	flush_cache_page(vma, addr, pte_pfn(pte));
 	set_pte_at(mm, addr, ptep, pte);