Commit:     a7ee2e5f5b4c9c72f4390c60ba7ea30306f47188
Parent:     f0ced9b229cfbc76b5db9837b4b256b602d56610
Author:     David Brownell <[EMAIL PROTECTED]>
AuthorDate: Sun May 6 14:50:50 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Mon May 7 12:12:59 2007 -0700

    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
    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: David Brownell <[EMAIL PROTECTED]>
    Acked-by: "Rafael J. Wysocki" <[EMAIL PROTECTED]>
    Acked-by: Pavel Machek <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 kernel/power/Kconfig |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 51a4dd0..8777217 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -78,17 +78,22 @@ config PM_SYSFS_DEPRECATED
          are likely to be bus or driver specific.
-       bool "Software Suspend"
+       bool "Software Suspend (Hibernation)"
        depends on PM && SWAP && ((X86 && (!SMP || SUSPEND_SMP)) || ((FRV || 
PPC32) && !SMP))
-         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 <>.
          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
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to