From: Christoph Lameter 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 Signed-off-by: Andrew Morton --- vm/page_migration | 0 include/linux/swap.h | 2 +- migrate.c | 0 3 files changed, 1 insertion(+), 1 deletion(-) diff -puN Documentation/vm/page_migration~swapless-pm-add-r-w-migration-entries-update-comments Documentation/vm/page_migration diff -puN include/linux/swap.h~swapless-pm-add-r-w-migration-entries-update-comments include/linux/swap.h --- devel/include/linux/swap.h~swapless-pm-add-r-w-migration-entries-update-comments 2006-05-11 15:18:46.000000000 -0700 +++ devel-akpm/include/linux/swap.h 2006-05-11 15:18:46.000000000 -0700 @@ -31,7 +31,7 @@ static inline int current_is_kswapd(void #ifndef CONFIG_MIGRATION #define MAX_SWAPFILES (1 << MAX_SWAPFILES_SHIFT) #else -/* Use last entry for page migration swap entries */ +/* Use last two entries for page migration swap entries */ #define MAX_SWAPFILES ((1 << MAX_SWAPFILES_SHIFT)-2) #define SWP_MIGRATION_READ MAX_SWAPFILES #define SWP_MIGRATION_WRITE (MAX_SWAPFILES + 1) diff -puN mm/migrate.c~swapless-pm-add-r-w-migration-entries-update-comments mm/migrate.c _