diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-07-08 23:14:17 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-07-08 23:14:17 +0200 |
| commit | 63f9ccb89552f25fa8cac57a6796479ca7eb527d (patch) | |
| tree | 6b8286f4d70ccf4f2a5b65764af7887836d02bf1 /include/linux | |
| parent | x86/power/64: Fix kernel text mapping corruption during image restoration (diff) | |
| parent | PM / hibernate: Recycle safe pages after image restoration (diff) | |
Merge back earlier suspend/hibernation changes for v4.8.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/suspend.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/suspend.h b/include/linux/suspend.h index 8b6ec7ef0854..7693e39b14fe 100644 --- a/include/linux/suspend.h +++ b/include/linux/suspend.h @@ -18,12 +18,11 @@ static inline void pm_set_vt_switch(int do_switch) #endif #ifdef CONFIG_VT_CONSOLE_SLEEP -extern int pm_prepare_console(void); +extern void pm_prepare_console(void); extern void pm_restore_console(void); #else -static inline int pm_prepare_console(void) +static inline void pm_prepare_console(void) { - return 0; } static inline void pm_restore_console(void) |