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

Commit a7ee2e5f authored by David Brownell's avatar David Brownell Committed by Linus Torvalds
Browse files

kconfig: mention 'hibernation' not just swsusp 



Clarify that "software suspend" is what's called "hibernation" in most user
interfaces, shrinking a terminology gap.  (Examples include Gnome and
MS-Windows.)

Also provide a more succinct description of what it does, so you won't have
to read the whole novel in Kconfig; and highlights just why the lack of
BIOS requirements for swsusp are a big deal.

Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Acked-by: default avatar"Rafael J. Wysocki" <rjw@sisk.pl>
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f0ced9b2

kernel/power/Kconfig

+8 −3
Original line number Diff line number Diff line
@@ -78,17 +78,22 @@ config PM_SYSFS_DEPRECATED 
	  are likely to be bus or driver specific.



config SOFTWARE_SUSPEND

	bool "Software Suspend"

	bool "Software Suspend (Hibernation)"

	depends on PM && SWAP && ((X86 && (!SMP || SUSPEND_SMP)) || ((FRV || PPC32) && !SMP))

	---help---

	  Enable the suspend to disk (STD) functionality.

	  Enable the suspend to disk (STD) functionality, which is usually

	  called "hibernation" in user interfaces.  STD checkpoints the

	  system and powers it off; and restores that checkpoint on reboot.



	  You can suspend your machine with 'echo disk > /sys/power/state'.

	  Alternatively, you can use the additional userland tools available

	  from <http://suspend.sf.net>.



	  In principle it does not require ACPI or APM, although for example

	  ACPI will be used if available.

	  ACPI will be used for the final steps when it is available.  One

	  of the reasons to use software suspend is that the firmware hooks

	  for suspend states like suspend-to-RAM (STR) often don't work very

	  well with Linux.



	  It creates an image which is saved in your active swap. Upon the next

	  boot, pass the 'resume=/dev/swappartition' argument to the kernel to