aboutsummaryrefslogtreecommitdiffstats
path: root/mm/rmap.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/rmap.c')
-rw-r--r--mm/rmap.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/mm/rmap.c b/mm/rmap.c
index c8454e06b6c8..78cc46b876e6 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -1282,7 +1282,7 @@ int try_to_unmap_one(struct page *page, struct vm_area_struct *vma,
1282 } 1282 }
1283 dec_mm_counter(mm, MM_ANONPAGES); 1283 dec_mm_counter(mm, MM_ANONPAGES);
1284 inc_mm_counter(mm, MM_SWAPENTS); 1284 inc_mm_counter(mm, MM_SWAPENTS);
1285 } else if (PAGE_MIGRATION) { 1285 } else if (IS_ENABLED(CONFIG_MIGRATION)) {
1286 /* 1286 /*
1287 * Store the pfn of the page in a special migration 1287 * Store the pfn of the page in a special migration
1288 * pte. do_swap_page() will wait until the migration 1288 * pte. do_swap_page() will wait until the migration
@@ -1293,7 +1293,8 @@ int try_to_unmap_one(struct page *page, struct vm_area_struct *vma,
1293 } 1293 }
1294 set_pte_at(mm, address, pte, swp_entry_to_pte(entry)); 1294 set_pte_at(mm, address, pte, swp_entry_to_pte(entry));
1295 BUG_ON(pte_file(*pte)); 1295 BUG_ON(pte_file(*pte));
1296 } else if (PAGE_MIGRATION && (TTU_ACTION(flags) == TTU_MIGRATION)) { 1296 } else if (IS_ENABLED(CONFIG_MIGRATION) &&
1297 (TTU_ACTION(flags) == TTU_MIGRATION)) {
1297 /* Establish migration entry for a file page */ 1298 /* Establish migration entry for a file page */
1298 swp_entry_t entry; 1299 swp_entry_t entry;
1299 entry = make_migration_entry(page, pte_write(pteval)); 1300 entry = make_migration_entry(page, pte_write(pteval));
@@ -1499,7 +1500,7 @@ static int try_to_unmap_anon(struct page *page, enum ttu_flags flags)
1499 * locking requirements of exec(), migration skips 1500 * locking requirements of exec(), migration skips
1500 * temporary VMAs until after exec() completes. 1501 * temporary VMAs until after exec() completes.
1501 */ 1502 */
1502 if (PAGE_MIGRATION && (flags & TTU_MIGRATION) && 1503 if (IS_ENABLED(CONFIG_MIGRATION) && (flags & TTU_MIGRATION) &&
1503 is_vma_temporary_stack(vma)) 1504 is_vma_temporary_stack(vma))
1504 continue; 1505 continue;
1505 1506