X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=mm%2Fmemory-failure.c;h=8c66042f0393bb782bdbb40a6354851b610aac40;hb=HEAD;hp=f283c7e0a2a302c617c03a3aebf60e262b94a895;hpb=3ddc76dfc786cc6f87852693227fb0b1f124f807;p=mirror_ubuntu-zesty-kernel.git

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index f283c7e0a2a3..8c66042f0393 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -1585,12 +1585,8 @@ static int soft_offline_huge_page(struct page *page, int flags)
 	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 (!list_empty(&pagelist))
+			putback_movable_pages(&pagelist);
 		if (ret > 0)
 			ret = -EIO;
 	} else {