projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.8-rc5' into x86/mm
[linux-2.6-block.git]
/
arch
/
x86
/
kernel
/
acpi
/
sleep.c
diff --git
a/arch/x86/kernel/acpi/sleep.c
b/arch/x86/kernel/acpi/sleep.c
index f146a3c1081471d615aadf9b445ea2ea71d4e940..0532f5d6e4efc66c264d1e7d47d44e615b833be3 100644
(file)
--- 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, ',');