mm/migration: return errno when isolate_huge_page failed

[people/ms/linux.git] / mm / migrate.c

diff --git a/mm/migrate.c b/mm/migrate.c
index c83b3ae2e285581e5699ca5ee07aaa491174a34f..1d036dec1328e0b5bcbb66ab02ee2929b4324d63 100644 (file)
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -133,7 +133,7 @@ static void putback_movable_page(struct page *page)
  *
  * This function shall be used whenever the isolated pageset has been
  * built from lru, balloon, hugetlbfs page. See isolate_migratepages_range()
- * and isolate_huge_page().
+ * and isolate_hugetlb().
  */
 void putback_movable_pages(struct list_head *l)
 {
@@ -1628,8 +1628,9 @@ static int add_page_for_migration(struct mm_struct *mm, unsigned long addr,
 
        if (PageHuge(page)) {
                if (PageHead(page)) {
-                       isolate_huge_page(page, pagelist);
-                       err = 1;
+                       err = isolate_hugetlb(page, pagelist);
+                       if (!err)
+                               err = 1;
                }
        } else {
                struct page *head;