From: Christoph Lameter 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 Signed-off-by: Andrew Morton --- mm/rmap.c | 13 +++++++++---- mprotect.c | 0 2 files changed, 9 insertions(+), 4 deletions(-) diff -puN mm/mprotect.c~more-page-migration-use-migration-entries-for-file-pages-fix mm/mprotect.c diff -puN mm/rmap.c~more-page-migration-use-migration-entries-for-file-pages-fix mm/rmap.c --- devel/mm/rmap.c~more-page-migration-use-migration-entries-for-file-pages-fix 2006-05-10 23:42:56.000000000 -0700 +++ devel-akpm/mm/rmap.c 2006-05-10 23:42:56.000000000 -0700 @@ -596,6 +596,7 @@ static int try_to_unmap_one(struct page spin_unlock(&mmlist_lock); } dec_mm_counter(mm, anon_rss); +#ifdef CONFIG_MIGRATION } else { /* * Store the pfn of the page in a special migration @@ -604,17 +605,21 @@ static int try_to_unmap_one(struct page */ BUG_ON(!migration); entry = make_migration_entry(page, pte_write(pteval)); +#endif } set_pte_at(mm, address, pte, swp_entry_to_pte(entry)); BUG_ON(pte_file(*pte)); - } else if (!migration) - dec_mm_counter(mm, file_rss); - else { + } else +#ifdef CONFIG_MIGRATION + if (migration) { /* Establish migration entry for a file page */ swp_entry_t entry; entry = make_migration_entry(page, pte_write(pteval)); set_pte_at(mm, address, pte, swp_entry_to_pte(entry)); - } + } else +#endif + dec_mm_counter(mm, file_rss); + page_remove_rmap(page); page_cache_release(page); _