The patch titled
page migration: ifdef out code
has been added to the -mm tree. Its filename is
swapless-pm-add-r-w-migration-entries-ifdefs.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/mprotect.c | 2 ++
rmap.c | 0
2 files changed, 2 insertions(+)
diff -puN mm/mprotect.c~swapless-pm-add-r-w-migration-entries-ifdefs mm/mprotect.c
--- devel/mm/mprotect.c~swapless-pm-add-r-w-migration-entries-ifdefs 2006-05-10 23:43:42.000000000 -0700
+++ devel-akpm/mm/mprotect.c 2006-05-10 23:43:42.000000000 -0700
@@ -45,6 +45,7 @@ static void change_pte_range(struct mm_s
ptent = pte_modify(ptep_get_and_clear(mm, addr, pte), newprot);
set_pte_at(mm, addr, pte, ptent);
lazy_mmu_prot_update(ptent);
+#ifdef CONFIG_MIGRATION
} else if (!pte_file(oldpte)) {
swp_entry_t entry = pte_to_swp_entry(oldpte);
@@ -57,6 +58,7 @@ static void change_pte_range(struct mm_s
set_pte_at(mm, addr, pte,
swp_entry_to_pte(entry));
}
+#endif
}
} while (pte++, addr += PAGE_SIZE, addr != end);
diff -puN mm/rmap.c~swapless-pm-add-r-w-migration-entries-ifdefs mm/rmap.c
_
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-pm-add-r-w-migration-entries-ifdefs.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-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
