Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
[PATCH] kconfig: Update swsusp description
Update the outdated and inaccurate description of the software suspend in
Kconfig.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
authored by
Rafael J. Wysocki
and committed by
Linus Torvalds
c7276fde
42a7fc4a
+21
-16
+21
-16
kernel/power/Kconfig
+21
-16
kernel/power/Kconfig
···
81
81
bool "Software Suspend"
82
82
depends on PM && SWAP && ((X86 && (!SMP || SUSPEND_SMP)) || ((FRV || PPC32) && !SMP))
83
83
---help---
84
-
Enable the possibility of suspending the machine.
85
-
It doesn't need ACPI or APM.
86
-
You may suspend your machine by 'swsusp' or 'shutdown -z <time>'
87
-
(patch for sysvinit needed).
84
+
Enable the suspend to disk (STD) functionality.
88
85
89
-
It creates an image which is saved in your active swap. Upon next
86
+
You can suspend your machine with 'echo disk > /sys/power/state'.
87
+
Alternatively, you can use the additional userland tools available
88
+
from <http://suspend.sf.net>.
89
+
90
+
In principle it does not require ACPI or APM, although for example
91
+
ACPI will be used if available.
92
+
93
+
It creates an image which is saved in your active swap. Upon the next
90
94
boot, pass the 'resume=/dev/swappartition' argument to the kernel to
91
95
have it detect the saved image, restore memory state from it, and
92
96
continue to run as before. If you do not want the previous state to
93
-
be reloaded, then use the 'noresume' kernel argument. However, note
94
-
that your partitions will be fsck'd and you must re-mkswap your swap
95
-
partitions. It does not work with swap files.
97
+
be reloaded, then use the 'noresume' kernel command line argument.
98
+
Note, however, that fsck will be run on your filesystems and you will
99
+
need to run mkswap against the swap partition used for the suspend.
96
100
97
-
Right now you may boot without resuming and then later resume but
98
-
in meantime you cannot use those swap partitions/files which were
99
-
involved in suspending. Also in this case there is a risk that buffers
100
-
on disk won't match with saved ones.
101
+
It also works with swap files to a limited extent (for details see
102
+
<file:Documentation/power/swsusp-and-swap-files.txt>).
103
+
104
+
Right now you may boot without resuming and resume later but in the
105
+
meantime you cannot use the swap partition(s)/file(s) involved in
106
+
suspending. Also in this case you must not use the filesystems
107
+
that were mounted before the suspend. In particular, you MUST NOT
108
+
MOUNT any journaled filesystems mounted before the suspend or they
109
+
will get corrupted in a nasty way.
101
110
102
111
For more information take a look at <file:Documentation/power/swsusp.txt>.
103
-
104
-
(For now, swsusp is incompatible with PAE aka HIGHMEM_64G on i386.
105
-
we need identity mapping for resume to work, and that is trivial
106
-
to get with 4MB pages, but less than trivial on PAE).
107
112
108
113
config PM_STD_PARTITION
109
114
string "Default resume partition"