diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2008-10-26 15:56:30 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-12-19 04:40:35 -0500 |
commit | ba84ed9546e91348fdf3ff2bff859b0ee53b407a (patch) | |
tree | f9ea9370416744de2fa80dbf7a4c25a2589c6a41 /Documentation | |
parent | b69edc76539be6a4aa39a22f85365fd4a3b3b9d2 (diff) |
ACPI hibernate: Introduce new kernel parameter acpi_sleep=s4_nonvs
On some machines it may be necessary to disable the saving/restoring
of the ACPI NVS memory region during hibernation/resume. For this
purpose, introduce new ACPI kernel command line option
acpi_sleep=s4_nonvs.
Based on a patch by Zhang Rui.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Nigel Cunningham <nigel@tuxonice.net>
Acked-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/kernel-parameters.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index e0f346d201ed..1d089eeff3cf 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -149,7 +149,8 @@ and is between 256 and 4096 characters. It is defined in the file | |||
149 | default: 0 | 149 | default: 0 |
150 | 150 | ||
151 | acpi_sleep= [HW,ACPI] Sleep options | 151 | acpi_sleep= [HW,ACPI] Sleep options |
152 | Format: { s3_bios, s3_mode, s3_beep, s4_nohwsig, old_ordering } | 152 | Format: { s3_bios, s3_mode, s3_beep, s4_nohwsig, |
153 | old_ordering, s4_nonvs } | ||
153 | See Documentation/power/video.txt for s3_bios and s3_mode. | 154 | See Documentation/power/video.txt for s3_bios and s3_mode. |
154 | s3_beep is for debugging; it makes the PC's speaker beep | 155 | s3_beep is for debugging; it makes the PC's speaker beep |
155 | as soon as the kernel's real-mode entry point is called. | 156 | as soon as the kernel's real-mode entry point is called. |
@@ -159,6 +160,8 @@ and is between 256 and 4096 characters. It is defined in the file | |||
159 | control method, wrt putting devices into low power | 160 | control method, wrt putting devices into low power |
160 | states, to be enforced (the ACPI 2.0 ordering of _PTS is | 161 | states, to be enforced (the ACPI 2.0 ordering of _PTS is |
161 | used by default). | 162 | used by default). |
163 | s4_nonvs prevents the kernel from saving/restoring the | ||
164 | ACPI NVS memory during hibernation. | ||
162 | 165 | ||
163 | acpi_sci= [HW,ACPI] ACPI System Control Interrupt trigger mode | 166 | acpi_sci= [HW,ACPI] ACPI System Control Interrupt trigger mode |
164 | Format: { level | edge | high | low } | 167 | Format: { level | edge | high | low } |