Fix UP compile - Remove parameters from macro definitions for migration function if CONFIG_MIGRATION is off. - Avoid name clash between migrate_page macro and the address operations field names migrate_page by renaming it to migratepage. - Adjust #ifdef CONFIG_MIGRATION in vmscan.c to include fail_migrate_page (provide by macro if !CONFIG_MIGRATION and surround putback_lru_pages() with #ifdef CONFIG_MIGRATION Signed-off-by: Christoph Lameter Index: linux-2.6.14-mm2/mm/vmscan.c =================================================================== --- linux-2.6.14-mm2.orig/mm/vmscan.c 2005-11-11 12:10:39.000000000 -0800 +++ linux-2.6.14-mm2/mm/vmscan.c 2005-11-11 12:10:41.000000000 -0800 @@ -572,6 +572,7 @@ keep: return reclaimed; } +#ifdef CONFIG_MIGRATION /* * Non migratable page */ @@ -580,8 +581,6 @@ int fail_migrate_page(struct page *newpa return -EIO; } - -#ifdef CONFIG_MIGRATION /* * swapout a single page * page is locked upon entry, unlocked on exit @@ -916,8 +915,8 @@ redo: if (!mapping) goto unlock_both; - if (mapping->a_ops->migrate_page) { - rc = mapping->a_ops->migrate_page(newpage, page); + if (mapping->a_ops->migratepage) { + rc = mapping->a_ops->migratepage(newpage, page); goto unlock_both; } @@ -1142,6 +1141,7 @@ done: pagevec_release(&pvec); } +#ifdef CONFIG_MIGRATION /* * Add isolated pages on the list back to the LRU * @@ -1159,6 +1159,7 @@ int putback_lru_pages(struct list_head * } return count; } +#endif /* * This moves pages from the active list to the inactive list. Index: linux-2.6.14-mm2/include/linux/fs.h =================================================================== --- linux-2.6.14-mm2.orig/include/linux/fs.h 2005-11-11 12:10:32.000000000 -0800 +++ linux-2.6.14-mm2/include/linux/fs.h 2005-11-11 12:10:41.000000000 -0800 @@ -367,7 +367,7 @@ struct address_space_operations { struct page* (*get_xip_page)(struct address_space *, sector_t, int); /* migrate the contents of a page to the specified target */ - int (*migrate_page) (struct page *, struct page *); + int (*migratepage) (struct page *, struct page *); }; struct backing_dev_info; @@ -1723,7 +1723,7 @@ extern ssize_t simple_read_from_buffer(v #ifdef CONFIG_MIGRATION extern int buffer_migrate_page(struct page *, struct page *); #else -#define buffer_migrate_page(a,b) NULL +#define buffer_migrate_page NULL #endif extern int inode_change_ok(struct inode *, struct iattr *); Index: linux-2.6.14-mm2/include/linux/swap.h =================================================================== --- linux-2.6.14-mm2.orig/include/linux/swap.h 2005-11-11 12:10:38.000000000 -0800 +++ linux-2.6.14-mm2/include/linux/swap.h 2005-11-11 12:10:41.000000000 -0800 @@ -189,8 +189,8 @@ extern void migrate_page_copy(struct pag extern int fail_migrate_page(struct page *, struct page *); #else /* Possible settings for the migrate_page() method in address_operations */ -#define migrate_page(a,b) NULL -#define fail_migrate_page(a,b) NULL +#define migrate_page NULL +#define fail_migrate_page NULL #endif #ifdef CONFIG_MMU Index: linux-2.6.14-mm2/mm/swap_state.c =================================================================== --- linux-2.6.14-mm2.orig/mm/swap_state.c 2005-11-11 12:10:38.000000000 -0800 +++ linux-2.6.14-mm2/mm/swap_state.c 2005-11-11 12:10:41.000000000 -0800 @@ -26,7 +26,7 @@ static struct address_space_operations s .writepage = swap_writepage, .sync_page = block_sync_page, .set_page_dirty = __set_page_dirty_nobuffers, - .migrate_page = migrate_page, + .migratepage = migrate_page, }; static struct backing_dev_info swap_backing_dev_info = { Index: linux-2.6.14-mm2/fs/ext2/inode.c =================================================================== --- linux-2.6.14-mm2.orig/fs/ext2/inode.c 2005-11-11 12:10:32.000000000 -0800 +++ linux-2.6.14-mm2/fs/ext2/inode.c 2005-11-11 12:10:41.000000000 -0800 @@ -706,7 +706,7 @@ struct address_space_operations ext2_aop .bmap = ext2_bmap, .direct_IO = ext2_direct_IO, .writepages = ext2_writepages, - .migrate_page = buffer_migrate_page, + .migratepage = buffer_migrate_page, }; struct address_space_operations ext2_aops_xip = { @@ -724,7 +724,7 @@ struct address_space_operations ext2_nob .bmap = ext2_bmap, .direct_IO = ext2_direct_IO, .writepages = ext2_writepages, - .migrate_page = buffer_migrate_page, + .migratepage = buffer_migrate_page, }; /* Index: linux-2.6.14-mm2/fs/ext3/inode.c =================================================================== --- linux-2.6.14-mm2.orig/fs/ext3/inode.c 2005-11-11 12:10:32.000000000 -0800 +++ linux-2.6.14-mm2/fs/ext3/inode.c 2005-11-11 12:10:41.000000000 -0800 @@ -1564,7 +1564,7 @@ static struct address_space_operations e .invalidatepage = ext3_invalidatepage, .releasepage = ext3_releasepage, .direct_IO = ext3_direct_IO, - .migrate_page = buffer_migrate_page, + .migratepage = buffer_migrate_page, }; static struct address_space_operations ext3_writeback_aops = { @@ -1578,7 +1578,7 @@ static struct address_space_operations e .invalidatepage = ext3_invalidatepage, .releasepage = ext3_releasepage, .direct_IO = ext3_direct_IO, - .migrate_page = buffer_migrate_page, + .migratepage = buffer_migrate_page, }; static struct address_space_operations ext3_journalled_aops = { Index: linux-2.6.14-mm2/fs/xfs/linux-2.6/xfs_aops.c =================================================================== --- linux-2.6.14-mm2.orig/fs/xfs/linux-2.6/xfs_aops.c 2005-11-11 12:10:32.000000000 -0800 +++ linux-2.6.14-mm2/fs/xfs/linux-2.6/xfs_aops.c 2005-11-11 12:10:41.000000000 -0800 @@ -1348,5 +1348,5 @@ struct address_space_operations linvfs_a .commit_write = generic_commit_write, .bmap = linvfs_bmap, .direct_IO = linvfs_direct_IO, - .migrate_page = buffer_migrate_page, + .migratepage = buffer_migrate_page, }; Index: linux-2.6.14-mm2/fs/xfs/linux-2.6/xfs_buf.c =================================================================== --- linux-2.6.14-mm2.orig/fs/xfs/linux-2.6/xfs_buf.c 2005-11-11 12:10:32.000000000 -0800 +++ linux-2.6.14-mm2/fs/xfs/linux-2.6/xfs_buf.c 2005-11-11 12:10:41.000000000 -0800 @@ -1568,7 +1568,7 @@ xfs_mapping_buftarg( struct address_space *mapping; static struct address_space_operations mapping_aops = { .sync_page = block_sync_page, - .migrate_page = fail_migrate_page, + .migratepage = fail_migrate_page, }; inode = new_inode(bdev->bd_inode->i_sb);