aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mm/memory-failure.c5
-rw-r--r--mm/migrate.c4
2 files changed, 4 insertions, 5 deletions
diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 75398b0bfede..237aaa488f4e 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -1295,7 +1295,10 @@ static int soft_offline_huge_page(struct page *page, int flags)
1295 ret = migrate_huge_pages(&pagelist, new_page, MPOL_MF_MOVE_ALL, 0, 1295 ret = migrate_huge_pages(&pagelist, new_page, MPOL_MF_MOVE_ALL, 0,
1296 true); 1296 true);
1297 if (ret) { 1297 if (ret) {
1298 putback_lru_pages(&pagelist); 1298 struct page *page1, *page2;
1299 list_for_each_entry_safe(page1, page2, &pagelist, lru)
1300 put_page(page1);
1301
1299 pr_debug("soft offline: %#lx: migration failed %d, type %lx\n", 1302 pr_debug("soft offline: %#lx: migration failed %d, type %lx\n",
1300 pfn, ret, page->flags); 1303 pfn, ret, page->flags);
1301 if (ret > 0) 1304 if (ret > 0)
diff --git a/mm/migrate.c b/mm/migrate.c
index 155a2e9a8059..766115253807 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -980,10 +980,6 @@ int migrate_huge_pages(struct list_head *from,
980 } 980 }
981 rc = 0; 981 rc = 0;
982out: 982out:
983
984 list_for_each_entry_safe(page, page2, from, lru)
985 put_page(page);
986
987 if (rc) 983 if (rc)
988 return rc; 984 return rc;
989 985