From: Domenico Andreoli uswsusp is no longer the preferred way to suspend/hibernate and the userspace tools have not received any update in years. Make it possible to enable the uswsusp support only if needed, prepare for future phase out. Signed-off-by: Domenico Andreoli Cc: "Rafael J. Wysocki" Cc: Pavel Machek Cc: Linux PM --- kernel/power/Kconfig | 5 +++++ kernel/power/Makefile | 3 ++- kernel/power/power.h | 5 +++++ 3 files changed, 12 insertions(+), 1 deletion(-) Index: b/kernel/power/Kconfig =================================================================== --- a/kernel/power/Kconfig +++ b/kernel/power/Kconfig @@ -80,6 +80,11 @@ config HIBERNATION For more information take a look at . +config HIBERNATION_USER + bool "Userspace software suspend interface (DEPRECATED)" + depends on HIBERNATION + default n + config PM_STD_PARTITION string "Default resume partition" depends on HIBERNATION Index: b/kernel/power/Makefile =================================================================== --- a/kernel/power/Makefile +++ b/kernel/power/Makefile @@ -10,7 +10,8 @@ obj-$(CONFIG_VT_CONSOLE_SLEEP) += consol obj-$(CONFIG_FREEZER) += process.o obj-$(CONFIG_SUSPEND) += suspend.o obj-$(CONFIG_PM_TEST_SUSPEND) += suspend_test.o -obj-$(CONFIG_HIBERNATION) += hibernate.o snapshot.o swap.o user.o +obj-$(CONFIG_HIBERNATION) += hibernate.o snapshot.o swap.o +obj-$(CONFIG_HIBERNATION_USER) += user.o obj-$(CONFIG_PM_AUTOSLEEP) += autosleep.o obj-$(CONFIG_PM_WAKELOCKS) += wakelock.o Index: b/kernel/power/power.h =================================================================== --- a/kernel/power/power.h +++ b/kernel/power/power.h @@ -158,8 +158,13 @@ extern sector_t alloc_swapdev_block(int extern void free_all_swap_pages(int swap); extern int swsusp_swap_in_use(void); +#ifdef CONFIG_HIBERNATION_USER bool swsusp_try_enter(void); void swsusp_leave(void); +#else +static inline bool swsusp_try_enter(void) { return 1; } +static inline void swsusp_leave(void) {} +#endif /* * Flags that can be passed from the hibernatig hernel to the "boot" kernel in