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 /include/linux | |
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 'include/linux')
-rw-r--r-- | include/linux/acpi.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index fba8051fb297..dfa0a5356c53 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h | |||
@@ -270,6 +270,7 @@ int acpi_check_mem_region(resource_size_t start, resource_size_t n, | |||
270 | #ifdef CONFIG_PM_SLEEP | 270 | #ifdef CONFIG_PM_SLEEP |
271 | void __init acpi_no_s4_hw_signature(void); | 271 | void __init acpi_no_s4_hw_signature(void); |
272 | void __init acpi_old_suspend_ordering(void); | 272 | void __init acpi_old_suspend_ordering(void); |
273 | void __init acpi_s4_no_nvs(void); | ||
273 | #endif /* CONFIG_PM_SLEEP */ | 274 | #endif /* CONFIG_PM_SLEEP */ |
274 | #else /* CONFIG_ACPI */ | 275 | #else /* CONFIG_ACPI */ |
275 | 276 | ||