From: Adrian Bunk Move the prototypes of count_highmem_pages() and restore_highmem() to kernel/power/power.h Signed-off-by: Adrian Bunk Acked-by: "Rafael J. Wysocki" Signed-off-by: Andrew Morton --- kernel/power/power.h | 8 ++++++++ kernel/power/snapshot.c | 1 - kernel/power/swsusp.c | 8 -------- 3 files changed, 8 insertions(+), 9 deletions(-) diff -puN kernel/power/power.h~kernel-power-move-function-prototypes-to-header kernel/power/power.h --- a/kernel/power/power.h~kernel-power-move-function-prototypes-to-header +++ a/kernel/power/power.h @@ -180,3 +180,11 @@ static inline int pm_notifier_call_chain return (blocking_notifier_call_chain(&pm_chain_head, val, NULL) == NOTIFY_BAD) ? -EINVAL : 0; } + +#ifdef CONFIG_HIGHMEM +unsigned int count_highmem_pages(void); +int restore_highmem(void); +#else +static inline unsigned int count_highmem_pages(void) { return 0; } +static inline int restore_highmem(void) { return 0; } +#endif diff -puN kernel/power/snapshot.c~kernel-power-move-function-prototypes-to-header kernel/power/snapshot.c --- a/kernel/power/snapshot.c~kernel-power-move-function-prototypes-to-header +++ a/kernel/power/snapshot.c @@ -872,7 +872,6 @@ unsigned int count_highmem_pages(void) } #else static inline void *saveable_highmem_page(unsigned long pfn) { return NULL; } -static inline unsigned int count_highmem_pages(void) { return 0; } #endif /* CONFIG_HIGHMEM */ /** diff -puN kernel/power/swsusp.c~kernel-power-move-function-prototypes-to-header kernel/power/swsusp.c --- a/kernel/power/swsusp.c~kernel-power-move-function-prototypes-to-header +++ a/kernel/power/swsusp.c @@ -64,14 +64,6 @@ unsigned long image_size = 500 * 1024 * int in_suspend __nosavedata = 0; -#ifdef CONFIG_HIGHMEM -unsigned int count_highmem_pages(void); -int restore_highmem(void); -#else -static inline int restore_highmem(void) { return 0; } -static inline unsigned int count_highmem_pages(void) { return 0; } -#endif - /** * The following functions are used for tracing the allocated * swap pages, so that they can be freed in case of an error. _