From: Adrian Bunk After this patch, we can make some code static. Signed-off-by: Adrian Bunk Cc: "Rafael J. Wysocki" Cc: Pavel Machek Signed-off-by: Andrew Morton --- include/linux/swap.h | 1 - kernel/power/power.h | 1 - kernel/power/snapshot.c | 4 ++-- mm/swapfile.c | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff -puN include/linux/swap.h~swsusp-low-level-interface-rev-2-fix include/linux/swap.h --- devel/include/linux/swap.h~swsusp-low-level-interface-rev-2-fix 2006-01-23 16:00:33.000000000 -0800 +++ devel-akpm/include/linux/swap.h 2006-01-23 16:00:33.000000000 -0800 @@ -237,7 +237,6 @@ extern struct page * read_swap_cache_asy /* linux/mm/swapfile.c */ extern long total_swap_pages; extern unsigned int nr_swapfiles; -extern struct swap_info_struct swap_info[]; extern void si_swapinfo(struct sysinfo *); extern swp_entry_t get_swap_page(void); extern swp_entry_t get_swap_page_of_type(int); diff -puN kernel/power/power.h~swsusp-low-level-interface-rev-2-fix kernel/power/power.h --- devel/kernel/power/power.h~swsusp-low-level-interface-rev-2-fix 2006-01-23 16:00:33.000000000 -0800 +++ devel-akpm/kernel/power/power.h 2006-01-23 16:00:33.000000000 -0800 @@ -48,7 +48,6 @@ extern void pm_restore_console(void); /* References to section boundaries */ extern const void __nosave_begin, __nosave_end; -extern unsigned int nr_copy_pages; extern struct pbe *pagedir_nosave; /* Preferred image size in bytes (default 500 MB) */ diff -puN kernel/power/snapshot.c~swsusp-low-level-interface-rev-2-fix kernel/power/snapshot.c --- devel/kernel/power/snapshot.c~swsusp-low-level-interface-rev-2-fix 2006-01-23 16:00:33.000000000 -0800 +++ devel-akpm/kernel/power/snapshot.c 2006-01-23 16:00:33.000000000 -0800 @@ -35,8 +35,8 @@ #include "power.h" struct pbe *pagedir_nosave; -unsigned int nr_copy_pages; -unsigned int nr_meta_pages; +static unsigned int nr_copy_pages; +static unsigned int nr_meta_pages; #ifdef CONFIG_HIGHMEM unsigned int count_highmem_pages(void) diff -puN mm/swapfile.c~swsusp-low-level-interface-rev-2-fix mm/swapfile.c --- devel/mm/swapfile.c~swsusp-low-level-interface-rev-2-fix 2006-01-23 16:00:33.000000000 -0800 +++ devel-akpm/mm/swapfile.c 2006-01-23 16:00:33.000000000 -0800 @@ -45,7 +45,7 @@ static const char Unused_offset[] = "Unu struct swap_list_t swap_list = {-1, -1}; -struct swap_info_struct swap_info[MAX_SWAPFILES]; +static struct swap_info_struct swap_info[MAX_SWAPFILES]; static DEFINE_MUTEX(swapon_mutex); _