Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f8ed1c6 authored by Adrian Bunk's avatar Adrian Bunk Committed by Len Brown
Browse files

Hibernation: Move function prototypes to header 



This patch moves the prototypes of count_highmem_pages() and
restore_highmem() to kernel/power/power.h

Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 964756a5

kernel/power/power.h

+8 −0
Original line number Diff line number Diff line
@@ -180,3 +180,11 @@ static inline int pm_notifier_call_chain(unsigned long val) 
	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

kernel/power/snapshot.c

+0 −1
Original line number Diff line number Diff line
@@ -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 */



/**

kernel/power/swsusp.c

+0 −8
Original line number Diff line number Diff line
@@ -64,14 +64,6 @@ unsigned long image_size = 500 * 1024 * 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.