From 0e2eb019fba4b66ba0fd93b9950850beab14b3b6 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@linux.intel.com>
Date: Mon, 11 Oct 2010 16:03:21 +0200
Subject: [PATCH] --- yaml --- r: 217355 b: refs/heads/master c:
 3ef8fd7f720fc4f462fcdcae2fcde6f1c0536bfe h: refs/heads/master i:   217353:
 8a42f388ee8838873e0b1d85b991a40953adcbdb   217351:
 d977adcf886b4d2eed1ff4d3e495cadb74da03b5 v: v3

---
 [refs]             | 2 +-
 trunk/mm/migrate.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

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);