aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/acpi.h
diff options
context:
space:
mode:
authorKristen Carlson Accardi <kristen@linux.intel.com>2012-10-26 07:39:15 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2012-11-14 18:16:02 -0500
commit1bad2f19f7f79d1ec9e6c48168fd7ce8dc1c305f (patch)
tree843ef81c4891196ccb995450d83fda7d478f8056 /include/linux/acpi.h
parentf4fa0e018a175ea92a3187ade8f678599dc5980a (diff)
ACPI / Sleep: add acpi_sleep=nonvs_s3 parameter
The ACPI specificiation would like us to save NVS at hibernation time, but makes no mention of saving NVS over S3. Not all versions of Windows do this either, and it is clear that not all machines need NVS saved/restored over S3. Allow the user to improve their suspend/resume time by disabling the NVS save/restore at S3 time, but continue to do the NVS save/restore for S4 as specified. Signed-off-by: Kristen Carlson Accardi <kristen@linux.intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'include/linux/acpi.h')
-rw-r--r--include/linux/acpi.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 90be98981102..3cf93491125c 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -261,6 +261,7 @@ int acpi_resources_are_enforced(void);
261void __init acpi_no_s4_hw_signature(void); 261void __init acpi_no_s4_hw_signature(void);
262void __init acpi_old_suspend_ordering(void); 262void __init acpi_old_suspend_ordering(void);
263void __init acpi_nvs_nosave(void); 263void __init acpi_nvs_nosave(void);
264void __init acpi_nvs_nosave_s3(void);
264#endif /* CONFIG_PM_SLEEP */ 265#endif /* CONFIG_PM_SLEEP */
265 266
266struct acpi_osc_context { 267struct acpi_osc_context {