diff options
| author | Rafael J. Wysocki | 2008-10-26 20:56:30 +0100 |
|---|---|---|
| committer | Len Brown | 2008-12-19 10:40:35 +0100 |
| commit | ba84ed9546e91348fdf3ff2bff859b0ee53b407a (patch) | |
| tree | f9ea9370416744de2fa80dbf7a4c25a2589c6a41 /arch/x86/kernel/acpi/sleep.c | |
| parent | x86 hibernate: Mark ACPI NVS memory region at startup (diff) | |
| download | kernel-qcow2-linux-ba84ed9546e91348fdf3ff2bff859b0ee53b407a.tar.gz kernel-qcow2-linux-ba84ed9546e91348fdf3ff2bff859b0ee53b407a.tar.xz kernel-qcow2-linux-ba84ed9546e91348fdf3ff2bff859b0ee53b407a.zip | |
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 'arch/x86/kernel/acpi/sleep.c')
| -rw-r--r-- | arch/x86/kernel/acpi/sleep.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c index 806b4e9051b4..707c1f6f95fa 100644 --- a/arch/x86/kernel/acpi/sleep.c +++ b/arch/x86/kernel/acpi/sleep.c @@ -159,6 +159,8 @@ static int __init acpi_sleep_setup(char *str) #endif if (strncmp(str, "old_ordering", 12) == 0) acpi_old_suspend_ordering(); + if (strncmp(str, "s4_nonvs", 8) == 0) + acpi_s4_no_nvs(); str = strchr(str, ','); if (str != NULL) str += strspn(str, ", \t"); |