---

yaml --- r: 217355 b: refs/heads/master c: 3ef8fd7 h: refs/heads/master i: 217353: 8a42f38 217351: d977adc v: v3
git-mirror · Oct 11, 2010 · 0e2eb01 · 0e2eb01
1 parent 13d0a3f
commit 0e2eb01
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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);