diff options
author | H. Peter Anvin <hpa@linux.intel.com> | 2010-07-28 13:11:28 -0700 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2010-07-28 13:11:28 -0700 |
commit | 7d50d07da23995a18ac449636cb42aec2cb2808d (patch) | |
tree | 0ddf940a5e9ddc5eeebc996601d7fee3c36ab836 /arch/x86/kernel/acpi/sleep.c | |
parent | 2decb194e65ab66eaf787512dc572cdc99893b24 (diff) | |
parent | 6aa033d7efb85830535bb83cf6713d6025ae6e59 (diff) |
Merge remote branch 'linus/master' into x86/cpu
Diffstat (limited to 'arch/x86/kernel/acpi/sleep.c')
-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 82e508677b91..fcc3c61fdecc 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, ','); |