Commit d08e7cf7 authored by Pavel Machek's avatar Pavel Machek Committed by Linus Torvalds

[PATCH] swsusp kconfig: Change in wording

Vadim says:

I was reading through the kernel/power/Kconfig file, and noticed that
the wording was slightly unclear. I poked at it a bit, hopefully making
the description a tad more straightforward, but you be the judge. :)
Diffed against 2.6.10-rc2.

From: Vadim Lobanov <vlobanov@speakeasy.net>
Signed-off-by: default avatarVadim Lobanov <vlobanov@speakeasy.net>
Signed-off-by: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 74f4331a
...@@ -35,14 +35,13 @@ config SOFTWARE_SUSPEND ...@@ -35,14 +35,13 @@ config SOFTWARE_SUSPEND
You may suspend your machine by 'swsusp' or 'shutdown -z <time>' You may suspend your machine by 'swsusp' or 'shutdown -z <time>'
(patch for sysvinit needed). (patch for sysvinit needed).
It creates an image which is saved in your active swaps. By the next It creates an image which is saved in your active swap. Upon next
booting the, pass 'resume=/dev/swappartition' and kernel will boot, pass the 'resume=/dev/swappartition' argument to the kernel to
detect the saved image, restore the memory from have it detect the saved image, restore memory state from it, and
it and then it continues to run as before you've suspended. continue to run as before. If you do not want the previous state to
If you don't want the previous state to continue use the 'noresume' be reloaded, then use the 'noresume' kernel argument. However, note
kernel option. However note that your partitions will be fsck'd and that your partitions will be fsck'd and you must re-mkswap your swap
you must re-mkswap your swap partitions. It does not work with swap partitions. It does not work with swap files.
files.
Right now you may boot without resuming and then later resume but Right now you may boot without resuming and then later resume but
in meantime you cannot use those swap partitions/files which were in meantime you cannot use those swap partitions/files which were
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment