diff options
| author | Kristen Carlson Accardi <kristen@linux.intel.com> | 2012-10-26 13:39:15 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-11-15 00:16:02 +0100 |
| commit | 1bad2f19f7f79d1ec9e6c48168fd7ce8dc1c305f (patch) | |
| tree | 843ef81c4891196ccb995450d83fda7d478f8056 /arch/x86/kernel/acpi | |
| parent | f4fa0e018a175ea92a3187ade8f678599dc5980a (diff) | |
| download | linux-1bad2f19f7f79d1ec9e6c48168fd7ce8dc1c305f.tar.gz linux-1bad2f19f7f79d1ec9e6c48168fd7ce8dc1c305f.tar.bz2 linux-1bad2f19f7f79d1ec9e6c48168fd7ce8dc1c305f.zip | |
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 'arch/x86/kernel/acpi')
| -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 11676cf65aee..d5e0d717005a 100644 --- a/arch/x86/kernel/acpi/sleep.c +++ b/arch/x86/kernel/acpi/sleep.c @@ -101,6 +101,8 @@ static int __init acpi_sleep_setup(char *str) #endif if (strncmp(str, "nonvs", 5) == 0) acpi_nvs_nosave(); + if (strncmp(str, "nonvs_s3", 8) == 0) + acpi_nvs_nosave_s3(); if (strncmp(str, "old_ordering", 12) == 0) acpi_old_suspend_ordering(); str = strchr(str, ','); |