diff options
| author | David Brownell <david-b@pacbell.net> | 2007-05-06 17:50:50 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 15:12:59 -0400 |
| commit | a7ee2e5f5b4c9c72f4390c60ba7ea30306f47188 (patch) | |
| tree | 36a02cb5f8d559c5513beb6faebc4323257d1642 | |
| parent | f0ced9b229cfbc76b5db9837b4b256b602d56610 (diff) | |
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: David Brownell <dbrownell@users.sourceforge.net>
Acked-by: "Rafael J. Wysocki" <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | kernel/power/Kconfig | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig index 51a4dd0f1b74..877721708fa4 100644 --- a/kernel/power/Kconfig +++ b/kernel/power/Kconfig | |||
| @@ -78,17 +78,22 @@ config PM_SYSFS_DEPRECATED | |||
| 78 | are likely to be bus or driver specific. | 78 | are likely to be bus or driver specific. |
| 79 | 79 | ||
| 80 | config SOFTWARE_SUSPEND | 80 | config SOFTWARE_SUSPEND |
| 81 | bool "Software Suspend" | 81 | bool "Software Suspend (Hibernation)" |
| 82 | depends on PM && SWAP && ((X86 && (!SMP || SUSPEND_SMP)) || ((FRV || PPC32) && !SMP)) | 82 | depends on PM && SWAP && ((X86 && (!SMP || SUSPEND_SMP)) || ((FRV || PPC32) && !SMP)) |
| 83 | ---help--- | 83 | ---help--- |
| 84 | Enable the suspend to disk (STD) functionality. | 84 | Enable the suspend to disk (STD) functionality, which is usually |
| 85 | called "hibernation" in user interfaces. STD checkpoints the | ||
| 86 | system and powers it off; and restores that checkpoint on reboot. | ||
| 85 | 87 | ||
| 86 | You can suspend your machine with 'echo disk > /sys/power/state'. | 88 | You can suspend your machine with 'echo disk > /sys/power/state'. |
| 87 | Alternatively, you can use the additional userland tools available | 89 | Alternatively, you can use the additional userland tools available |
| 88 | from <http://suspend.sf.net>. | 90 | from <http://suspend.sf.net>. |
| 89 | 91 | ||
| 90 | In principle it does not require ACPI or APM, although for example | 92 | In principle it does not require ACPI or APM, although for example |
| 91 | ACPI will be used if available. | 93 | ACPI will be used for the final steps when it is available. One |
| 94 | of the reasons to use software suspend is that the firmware hooks | ||
| 95 | for suspend states like suspend-to-RAM (STR) often don't work very | ||
| 96 | well with Linux. | ||
| 92 | 97 | ||
| 93 | It creates an image which is saved in your active swap. Upon the next | 98 | It creates an image which is saved in your active swap. Upon the next |
| 94 | boot, pass the 'resume=/dev/swappartition' argument to the kernel to | 99 | boot, pass the 'resume=/dev/swappartition' argument to the kernel to |