From: Adrian Bunk - make needlessly global functions static - make dummy functions static inline Signed-off-by: Adrian Bunk Acked-by: Pavel Machek Signed-off-by: Andrew Morton --- kernel/power/snapshot.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff -puN kernel/power/snapshot.c~kernel-power-snapshotc-cleanups kernel/power/snapshot.c --- devel/kernel/power/snapshot.c~kernel-power-snapshotc-cleanups 2006-04-22 01:39:33.000000000 -0700 +++ devel-akpm/kernel/power/snapshot.c 2006-04-22 01:39:33.000000000 -0700 @@ -122,7 +122,7 @@ static int restore_arch_mem(void) } #ifdef CONFIG_HIGHMEM -unsigned int count_highmem_pages(void) +static unsigned int count_highmem_pages(void) { struct zone *zone; unsigned long zone_pfn; @@ -199,7 +199,7 @@ static int save_highmem_zone(struct zone return 0; } -int save_highmem(void) +static int save_highmem(void) { struct zone *zone; int res = 0; @@ -216,7 +216,7 @@ int save_highmem(void) return 0; } -int restore_highmem(void) +static int restore_highmem(void) { printk("swsusp: Restoring Highmem\n"); while (highmem_copy) { @@ -233,9 +233,9 @@ int restore_highmem(void) return 0; } #else -static unsigned int count_highmem_pages(void) {return 0;} -static int save_highmem(void) {return 0;} -static int restore_highmem(void) {return 0;} +static inline unsigned int count_highmem_pages(void) {return 0;} +static inline int save_highmem(void) {return 0;} +static inline int restore_highmem(void) {return 0;} #endif unsigned int count_special_pages(void) @@ -482,7 +482,8 @@ unsigned long get_safe_page(gfp_t gfp_ma * On each page we set up a list of struct_pbe elements. */ -struct pbe *alloc_pagedir(unsigned int nr_pages, gfp_t gfp_mask, int safe_needed) +static struct pbe *alloc_pagedir(unsigned int nr_pages, gfp_t gfp_mask, + int safe_needed) { unsigned int num; struct pbe *pblist, *pbe; _