From: Andrew Morton - Don't bother putting ifdefs around a function declaration. If it's not there the linker will tell us ;) Cc: Christoph Lameter Signed-off-by: Andrew Morton --- include/linux/rmap.h | 2 -- include/linux/swap.h | 2 -- mm/swapfile.c | 1 - rmap.c | 0 vmscan.c | 0 5 files changed, 5 deletions(-) diff -puN include/linux/rmap.h~direct-migration-v9-remove_from_swap-to-remove-swap-ptes-fixes include/linux/rmap.h --- 25/include/linux/rmap.h~direct-migration-v9-remove_from_swap-to-remove-swap-ptes-fixes Tue Jan 17 16:24:05 2006 +++ 25-akpm/include/linux/rmap.h Tue Jan 17 16:24:05 2006 @@ -92,9 +92,7 @@ static inline void page_dup_rmap(struct */ int page_referenced(struct page *, int is_locked); int try_to_unmap(struct page *, int ignore_refs); -#ifdef CONFIG_MIGRATION void remove_from_swap(struct page *page); -#endif /* * Called from mm/filemap_xip.c to unmap empty zero page diff -puN include/linux/swap.h~direct-migration-v9-remove_from_swap-to-remove-swap-ptes-fixes include/linux/swap.h --- 25/include/linux/swap.h~direct-migration-v9-remove_from_swap-to-remove-swap-ptes-fixes Tue Jan 17 16:24:05 2006 +++ 25-akpm/include/linux/swap.h Tue Jan 17 16:24:05 2006 @@ -247,9 +247,7 @@ extern int remove_exclusive_swap_page(st struct backing_dev_info; extern spinlock_t swap_lock; -#ifdef CONFIG_MIGRATION extern int remove_vma_swap(struct vm_area_struct *vma, struct page *page); -#endif /* linux/mm/thrash.c */ extern struct mm_struct * swap_token_mm; diff -puN mm/rmap.c~direct-migration-v9-remove_from_swap-to-remove-swap-ptes-fixes mm/rmap.c diff -puN mm/swapfile.c~direct-migration-v9-remove_from_swap-to-remove-swap-ptes-fixes mm/swapfile.c --- 25/mm/swapfile.c~direct-migration-v9-remove_from_swap-to-remove-swap-ptes-fixes Tue Jan 17 16:24:05 2006 +++ 25-akpm/mm/swapfile.c Tue Jan 17 16:24:05 2006 @@ -562,7 +562,6 @@ int remove_vma_swap(struct vm_area_struc } #endif - /* * Scan swap_map from current position to next entry still in use. * Recycle to start on reaching the end, returning 0 when empty. diff -puN mm/vmscan.c~direct-migration-v9-remove_from_swap-to-remove-swap-ptes-fixes mm/vmscan.c _