1 files changed, 12 insertions, 3 deletions

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index d84c5e5331bb..e05ed31c0f61 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -1470,6 +1470,7 @@ static int soft_offline_huge_page(struct page *page, int flags)
         int ret;
         unsigned long pfn = page_to_pfn(page);
         struct page *hpage = compound_head(page);
+        LIST_HEAD(pagelist);
 
         /*
          * This double-check of PageHWPoison is to avoid the race with
@@ -1485,12 +1486,20 @@ static int soft_offline_huge_page(struct page *page, int flags)
         unlock_page(hpage);
 
         /* Keep page count to indicate a given hugepage is isolated. */
-        ret = migrate_huge_page(hpage, new_page, MPOL_MF_MOVE_ALL,
-                                MIGRATE_SYNC);
-        put_page(hpage);
+        list_move(&hpage->lru, &pagelist);
+        ret = migrate_pages(&pagelist, new_page, MPOL_MF_MOVE_ALL,
+                                MIGRATE_SYNC, MR_MEMORY_FAILURE);
         if (ret) {
                 pr_info("soft offline: %#lx: migration failed %d, type %lx\n",
                         pfn, ret, page->flags);
+                /*
+                 * We know that soft_offline_huge_page() tries to migrate
+                 * only one hugepage pointed to by hpage, so we need not
+                 * run through the pagelist here.
+                 */
+                putback_active_hugepage(hpage);
+                if (ret > 0)
+                        ret = -EIO;
         } else {
                 set_page_hwpoison_huge_page(hpage);
                 dequeue_hwpoisoned_huge_page(hpage);