3 files changed, 35 insertions, 2 deletions

diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index c2b1801a160b..bc8d8370cd0d 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -66,6 +66,8 @@ int hugetlb_reserve_pages(struct inode *inode, long from, long to,
                                                 vm_flags_t vm_flags);
 void hugetlb_unreserve_pages(struct inode *inode, long offset, long freed);
 int dequeue_hwpoisoned_huge_page(struct page *page);
+bool isolate_huge_page(struct page *page, struct list_head *list);
+void putback_active_hugepage(struct page *page);
 void copy_huge_page(struct page *dst, struct page *src);
 
 #ifdef CONFIG_ARCH_WANT_HUGE_PMD_SHARE
@@ -134,6 +136,8 @@ static inline int dequeue_hwpoisoned_huge_page(struct page *page)
         return 0;
 }
 
+#define isolate_huge_page(p, l) false
+#define putback_active_hugepage(p)      do {} while (0)
 static inline void copy_huge_page(struct page *dst, struct page *src)
 {
 }
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 06315560bd23..e51723866fb1 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -48,7 +48,8 @@ static unsigned long __initdata default_hstate_max_huge_pages;
 static unsigned long __initdata default_hstate_size;
 
 /*
- * Protects updates to hugepage_freelists, nr_huge_pages, and free_huge_pages
+ * Protects updates to hugepage_freelists, hugepage_activelist, nr_huge_pages,
+ * free_huge_pages, and surplus_huge_pages.
  */
 DEFINE_SPINLOCK(hugetlb_lock);
 
@@ -3422,3 +3423,23 @@ int dequeue_hwpoisoned_huge_page(struct page *hpage)
         return ret;
 }
 #endif
+
+bool isolate_huge_page(struct page *page, struct list_head *list)
+{
+        VM_BUG_ON(!PageHead(page));
+        if (!get_page_unless_zero(page))
+                return false;
+        spin_lock(&hugetlb_lock);
+        list_move_tail(&page->lru, list);
+        spin_unlock(&hugetlb_lock);
+        return true;
+}
+
+void putback_active_hugepage(struct page *page)
+{
+        VM_BUG_ON(!PageHead(page));
+        spin_lock(&hugetlb_lock);
+        list_move_tail(&page->lru, &(page_hstate(page))->hugepage_activelist);
+        spin_unlock(&hugetlb_lock);
+        put_page(page);
+}
diff --git a/mm/migrate.c b/mm/migrate.c
index 6f0c24438bba..b44a067fee10 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -100,6 +100,10 @@ void putback_movable_pages(struct list_head *l)
         struct page *page2;
 
         list_for_each_entry_safe(page, page2, l, lru) {
+                if (unlikely(PageHuge(page))) {
+                        putback_active_hugepage(page);
+                        continue;
+                }
                 list_del(&page->lru);
                 dec_zone_page_state(page, NR_ISOLATED_ANON +
                                 page_is_file_cache(page));
@@ -1025,7 +1029,11 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page,
                 list_for_each_entry_safe(page, page2, from, lru) {
                         cond_resched();
 
-                        rc = unmap_and_move(get_new_page, private,
+                        if (PageHuge(page))
+                                rc = unmap_and_move_huge_page(get_new_page,
+                                                private, page, pass > 2, mode);
+                        else
+                                rc = unmap_and_move(get_new_page, private,
                                                 page, pass > 2, mode);
 
                         switch(rc) {