diff options
author | Hugh Dickins <hughd@google.com> | 2013-02-22 19:35:14 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-23 20:50:19 -0500 |
commit | 9c620e2bc5aa4256c102ada34e6c76204ed5898b (patch) | |
tree | 667dc829d7c5fa0261658fa6488f67cbd52bfb7e /mm/memory-failure.c | |
parent | b79bc0a0c79e06cc87e17530e9c1c56c6f297e17 (diff) |
mm: remove offlining arg to migrate_pages
No functional change, but the only purpose of the offlining argument to
migrate_pages() etc, was to ensure that __unmap_and_move() could migrate a
KSM page for memory hotremove (which took ksm_thread_mutex) but not for
other callers. Now all cases are safe, remove the arg.
Signed-off-by: Hugh Dickins <hughd@google.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Petr Holasek <pholasek@redhat.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Izik Eidus <izik.eidus@ravellosystems.com>
Cc: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/memory-failure.c')
-rw-r--r-- | mm/memory-failure.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 1a56d63adf9c..e4683459ab26 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c | |||
@@ -1465,7 +1465,7 @@ static int soft_offline_huge_page(struct page *page, int flags) | |||
1465 | unlock_page(hpage); | 1465 | unlock_page(hpage); |
1466 | 1466 | ||
1467 | /* Keep page count to indicate a given hugepage is isolated. */ | 1467 | /* Keep page count to indicate a given hugepage is isolated. */ |
1468 | ret = migrate_huge_page(hpage, new_page, MPOL_MF_MOVE_ALL, false, | 1468 | ret = migrate_huge_page(hpage, new_page, MPOL_MF_MOVE_ALL, |
1469 | MIGRATE_SYNC); | 1469 | MIGRATE_SYNC); |
1470 | put_page(hpage); | 1470 | put_page(hpage); |
1471 | if (ret) { | 1471 | if (ret) { |
@@ -1597,11 +1597,10 @@ static int __soft_offline_page(struct page *page, int flags) | |||
1597 | if (!ret) { | 1597 | if (!ret) { |
1598 | LIST_HEAD(pagelist); | 1598 | LIST_HEAD(pagelist); |
1599 | inc_zone_page_state(page, NR_ISOLATED_ANON + | 1599 | inc_zone_page_state(page, NR_ISOLATED_ANON + |
1600 | page_is_file_cache(page)); | 1600 | page_is_file_cache(page)); |
1601 | list_add(&page->lru, &pagelist); | 1601 | list_add(&page->lru, &pagelist); |
1602 | ret = migrate_pages(&pagelist, new_page, MPOL_MF_MOVE_ALL, | 1602 | ret = migrate_pages(&pagelist, new_page, MPOL_MF_MOVE_ALL, |
1603 | false, MIGRATE_SYNC, | 1603 | MIGRATE_SYNC, MR_MEMORY_FAILURE); |
1604 | MR_MEMORY_FAILURE); | ||
1605 | if (ret) { | 1604 | if (ret) { |
1606 | putback_lru_pages(&pagelist); | 1605 | putback_lru_pages(&pagelist); |
1607 | pr_info("soft offline: %#lx: migration failed %d, type %lx\n", | 1606 | pr_info("soft offline: %#lx: migration failed %d, type %lx\n", |