mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-24 21:54:34 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: fix XEN_SAVE_RESTORE Kconfig dependencies PM / Hibernate: Introduce CONFIG_HIBERNATE_CALLBACKS
This commit is contained in:
commit
aaa119a3d4
9 changed files with 28 additions and 28 deletions
|
|
@ -249,6 +249,8 @@ extern void hibernation_set_ops(const struct platform_hibernation_ops *ops);
|
|||
extern int hibernate(void);
|
||||
extern bool system_entering_hibernation(void);
|
||||
#else /* CONFIG_HIBERNATION */
|
||||
static inline void register_nosave_region(unsigned long b, unsigned long e) {}
|
||||
static inline void register_nosave_region_late(unsigned long b, unsigned long e) {}
|
||||
static inline int swsusp_page_is_forbidden(struct page *p) { return 0; }
|
||||
static inline void swsusp_set_page_free(struct page *p) {}
|
||||
static inline void swsusp_unset_page_free(struct page *p) {}
|
||||
|
|
@ -297,14 +299,7 @@ static inline bool pm_wakeup_pending(void) { return false; }
|
|||
|
||||
extern struct mutex pm_mutex;
|
||||
|
||||
#ifndef CONFIG_HIBERNATION
|
||||
static inline void register_nosave_region(unsigned long b, unsigned long e)
|
||||
{
|
||||
}
|
||||
static inline void register_nosave_region_late(unsigned long b, unsigned long e)
|
||||
{
|
||||
}
|
||||
|
||||
#ifndef CONFIG_HIBERNATE_CALLBACKS
|
||||
static inline void lock_system_sleep(void) {}
|
||||
static inline void unlock_system_sleep(void) {}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue