diff options
| author | Len Brown <len.brown@intel.com> | 2010-07-24 23:26:22 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-07-24 23:26:22 -0400 |
| commit | 0e1cf38889110a7188999388614aef17a84d9d25 (patch) | |
| tree | 828ba587fc124a2c28cb52d2b6a8ea07e4b57079 /arch/x86 | |
| parent | bbac30edb39a80426e4a3420a5ec635eb4466f63 (diff) | |
| parent | 72ad5d77fb981963edae15eee8196c80238f5ed0 (diff) | |
Merge branch 'bugzilla-16396' into release
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/acpi/sleep.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c index 82e508677b9..fcc3c61fdec 100644 --- a/arch/x86/kernel/acpi/sleep.c +++ b/arch/x86/kernel/acpi/sleep.c @@ -157,9 +157,14 @@ static int __init acpi_sleep_setup(char *str) #ifdef CONFIG_HIBERNATION if (strncmp(str, "s4_nohwsig", 10) == 0) acpi_no_s4_hw_signature(); - if (strncmp(str, "s4_nonvs", 8) == 0) - acpi_s4_no_nvs(); + if (strncmp(str, "s4_nonvs", 8) == 0) { + pr_warning("ACPI: acpi_sleep=s4_nonvs is deprecated, " + "please use acpi_sleep=nonvs instead"); + acpi_nvs_nosave(); + } #endif + if (strncmp(str, "nonvs", 5) == 0) + acpi_nvs_nosave(); if (strncmp(str, "old_ordering", 12) == 0) acpi_old_suspend_ordering(); str = strchr(str, ','); |