diff options
author | Bojan Smojver <bojan@rexursive.com> | 2010-09-09 17:06:23 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2010-10-16 19:57:42 -0400 |
commit | f996fc9671d088bd5f52a70f18c64bfe3d0e418f (patch) | |
tree | 3d88b5adfa21fc71cbabb9a891d37b0c1ce1c692 /Documentation | |
parent | 05aa55dddb9ee4045c320661068bea78dad6a6e5 (diff) |
PM / Hibernate: Compress hibernation image with LZO
Compress hibernation image with LZO in order to save on I/O and
therefore time to hibernate/thaw.
[rjw: Added hibernate=nocompress command line option instead of just
nocompress which would be confusing, fixed a couple of compiler
warnings, fixed kerneldoc comments, minor cleanups.]
Signed-off-by: Bojan Smojver <bojan@rexursive.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/kernel-parameters.txt | 5 | ||||
-rw-r--r-- | Documentation/power/swsusp.txt | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 8dd7248508a..2c98b18864c 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -2165,6 +2165,11 @@ and is between 256 and 4096 characters. It is defined in the file | |||
2165 | in <PAGE_SIZE> units (needed only for swap files). | 2165 | in <PAGE_SIZE> units (needed only for swap files). |
2166 | See Documentation/power/swsusp-and-swap-files.txt | 2166 | See Documentation/power/swsusp-and-swap-files.txt |
2167 | 2167 | ||
2168 | hibernate= [HIBERNATION] | ||
2169 | noresume Don't check if there's a hibernation image | ||
2170 | present during boot. | ||
2171 | nocompress Don't compress/decompress hibernation images. | ||
2172 | |||
2168 | retain_initrd [RAM] Keep initrd memory after extraction | 2173 | retain_initrd [RAM] Keep initrd memory after extraction |
2169 | 2174 | ||
2170 | rhash_entries= [KNL,NET] | 2175 | rhash_entries= [KNL,NET] |
diff --git a/Documentation/power/swsusp.txt b/Documentation/power/swsusp.txt index 9d60ab717a7..ea718891a66 100644 --- a/Documentation/power/swsusp.txt +++ b/Documentation/power/swsusp.txt | |||
@@ -66,7 +66,8 @@ swsusp saves the state of the machine into active swaps and then reboots or | |||
66 | powerdowns. You must explicitly specify the swap partition to resume from with | 66 | powerdowns. You must explicitly specify the swap partition to resume from with |
67 | ``resume='' kernel option. If signature is found it loads and restores saved | 67 | ``resume='' kernel option. If signature is found it loads and restores saved |
68 | state. If the option ``noresume'' is specified as a boot parameter, it skips | 68 | state. If the option ``noresume'' is specified as a boot parameter, it skips |
69 | the resuming. | 69 | the resuming. If the option ``hibernate=nocompress'' is specified as a boot |
70 | parameter, it saves hibernation image without compression. | ||
70 | 71 | ||
71 | In the meantime while the system is suspended you should not add/remove any | 72 | In the meantime while the system is suspended you should not add/remove any |
72 | of the hardware, write to the filesystems, etc. | 73 | of the hardware, write to the filesystems, etc. |