The patch titled
page migration: ifdef out code
has been added to the -mm tree. Its filename is
more-page-migration-use-migration-entries-for-file-pages-fix.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
From: Christoph Lameter <clameter@xxxxxxx>
ifdef around migration codeClean up various minor things.
Put #ifdef CONFIG_MIGRATION around two locations that would
generate code for the non migration case.
Signed-off-by: Christoph Lameter <clameter@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
mm/rmap.c | 13 +++++++++----
mprotect.c | 0
2 files changed, 9 insertions(+), 4 deletions(-)
diff -puN mm/mprotect.c~more-page-migration-use-migration-entries-for-file-pages-fix mm/mprotect.c
diff -puN mm/rmap.c~more-page-migration-use-migration-entries-for-file-pages-fix mm/rmap.c
--- devel/mm/rmap.c~more-page-migration-use-migration-entries-for-file-pages-fix 2006-05-10 23:42:56.000000000 -0700
+++ devel-akpm/mm/rmap.c 2006-05-10 23:42:56.000000000 -0700
@@ -596,6 +596,7 @@ static int try_to_unmap_one(struct page
spin_unlock(&mmlist_lock);
}
dec_mm_counter(mm, anon_rss);
+#ifdef CONFIG_MIGRATION
} else {
/*
* Store the pfn of the page in a special migration
@@ -604,17 +605,21 @@ static int try_to_unmap_one(struct page
*/
BUG_ON(!migration);
entry = make_migration_entry(page, pte_write(pteval));
+#endif
}
set_pte_at(mm, address, pte, swp_entry_to_pte(entry));
BUG_ON(pte_file(*pte));
- } else if (!migration)
- dec_mm_counter(mm, file_rss);
- else {
+ } else
+#ifdef CONFIG_MIGRATION
+ if (migration) {
/* Establish migration entry for a file page */
swp_entry_t entry;
entry = make_migration_entry(page, pte_write(pteval));
set_pte_at(mm, address, pte, swp_entry_to_pte(entry));
- }
+ } else
+#endif
+ dec_mm_counter(mm, file_rss);
+
page_remove_rmap(page);
page_cache_release(page);
_
Patches currently in -mm which might be from clameter@xxxxxxx are
origin.patch
page-migration-make-do_swap_page-redo-the-fault.patch
slab-extract-cache_free_alien-from-__cache_free.patch
migration-remove-unnecessary-pageswapcache-checks.patch
page-migration-cleanup-rename-ignrefs-to-migration.patch
page-migration-cleanup-group-functions.patch
page-migration-cleanup-remove-useless-definitions.patch
page-migration-cleanup-drop-nr_refs-in-remove_references.patch
page-migration-cleanup-extract-try_to_unmap-from-migration-functions.patch
page-migration-cleanup-pass-mapping-to-migration-functions.patch
page-migration-cleanup-move-fallback-handling-into-special-function.patch
swapless-pm-add-r-w-migration-entries.patch
swapless-page-migration-rip-out-swap-based-logic.patch
swapless-page-migration-modify-core-logic.patch
more-page-migration-do-not-inc-dec-rss-counters.patch
more-page-migration-use-migration-entries-for-file-pages.patch
more-page-migration-use-migration-entries-for-file-pages-fix.patch
page-migration-ifdef-out-code-2.patch
page-migration-update-comments.patch
page-migration-remove-useless-mapping-checks.patch
page-migration-fix-up-remove_migration_ptes.patch
page-migration-replace-call-to-pageout-with-writepage.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
