The patch titled page migration: ifdef out code has been removed from the -mm tree. Its filename is swapless-pm-add-r-w-migration-entries-ifdefs.patch This patch was probably dropped from -mm because it has now been merged into a subsystem tree or into Linus's tree, or because it was folded into its parent patch in the -mm tree. ------------------------------------------------------ Subject: page migration: ifdef out code 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 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-fix-2.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 page-migration-update-documentation.patch mm-remove-vm_locked-before-remap_pfn_range-and-drop-vm_shm.patch page-migration-simplify-migrate_pages.patch page-migration-simplify-migrate_pages-tweaks.patch page-migration-handle-freeing-of-pages-in-migrate_pages.patch page-migration-use-allocator-function-for-migrate_pages.patch page-migration-support-moving-of-individual-pages.patch page-migration-detailed-status-for-moving-of-individual-pages.patch page-migration-support-moving-of-individual-pages-fixes.patch page-migration-support-moving-of-individual-pages-x86_64-support.patch page-migration-support-moving-of-individual-pages-x86-support.patch page-migration-support-a-vma-migration-function.patch allow-migration-of-mlocked-pages.patch cpuset-remove-extra-cpuset_zone_allowed-check-in-__alloc_pages.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