Hi, cleanup of P07-memory_migration.patch and P10-migrate-rollback.patch. The patch is against 2.6.10-rc1-mm2-mhp1 .This is what Iwamoto pointed out. rewind_page() is renamed unwind_pages(), as unwind is a proper name. Signed-off-by: Hirokazu Takahashi Signed-off-by: Dave Hansen --- memhotplug-dave/mm/mmigrate.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff -puN mm/mmigrate.c~AA-PM-10.3-rename_rewind_page_to_unwind_page mm/mmigrate.c --- memhotplug/mm/mmigrate.c~AA-PM-10.3-rename_rewind_page_to_unwind_page 2005-03-28 16:38:16.000000000 -0800 +++ memhotplug-dave/mm/mmigrate.c 2005-03-28 16:38:16.000000000 -0800 @@ -163,7 +163,7 @@ migrate_page_common(struct page *page, s * In some cases, a page migration needs to be rolled back. */ static int -rewind_page(struct page *page, struct page *newpage) +unwind_page(struct page *page, struct page *newpage) { struct address_space *mapping = page_mapping(newpage); int truncated = !PageSwapCache(newpage) && page_mapping(page) == NULL; @@ -172,7 +172,7 @@ rewind_page(struct page *page, struct pa BUG_ON(mapping == NULL); /* - * Rewinding is not needed if the newpage has been already truncated. + * Unwinding is not needed if the newpage has been already truncated. */ if (truncated) goto out; @@ -327,7 +327,7 @@ generic_migrate_page(struct page *page, out_busy: /* Roll back all operations. */ - rewind_page(page, newpage); + unwind_page(page, newpage); return ret; out_removing: _