The patch titled page migration: Update comments has been added to the -mm tree. Its filename is swapless-pm-add-r-w-migration-entries-update-comments-6.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> Edit comments to be nicer better and reflect the current state of page migration. Remove useless BUG_ON() in migrate_entry_wait() since migration_entry_to_page() already does a BUG_ON(). Signed-off-by: Christoph Lameter <clameter@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- vm/page_migration | 0 mm/migrate.c | 3 --- linux/swap.h | 0 3 files changed, 3 deletions(-) diff -puN Documentation/vm/page_migration~swapless-pm-add-r-w-migration-entries-update-comments-6 Documentation/vm/page_migration diff -puN include/linux/swap.h~swapless-pm-add-r-w-migration-entries-update-comments-6 include/linux/swap.h diff -puN mm/migrate.c~swapless-pm-add-r-w-migration-entries-update-comments-6 mm/migrate.c --- devel/mm/migrate.c~swapless-pm-add-r-w-migration-entries-update-comments-6 2006-05-10 23:58:19.000000000 -0700 +++ devel-akpm/mm/migrate.c 2006-05-10 23:58:19.000000000 -0700 @@ -236,9 +236,6 @@ void migration_entry_wait(struct mm_stru page = migration_entry_to_page(entry); - /* Pages with migration entries are always locked */ - BUG_ON(!PageLocked(page)); - get_page(page); pte_unmap_unlock(ptep, ptl); wait_on_page_locked(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-pm-add-r-w-migration-entries-ifdefs.patch swapless-pm-add-r-w-migration-entries-update-comments.patch swapless-pm-add-r-w-migration-entries-update-comments-4.patch swapless-pm-add-r-w-migration-entries-update-comments-6.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 more-page-migration-use-migration-entries-for-file-pages-update-comments-5.patch page-migration-update-documentation.patch page-migration-update-comments-7.patch page-migration-update-comments-8.patch page-migration-update-comments-9.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