summaryrefslogtreecommitdiff
path: root/Documentation/power
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-08-29 00:15:47 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-08-29 00:15:47 +0200
commitcba630b6f5cf6bb468f5c2da77f3dee2125bd0c1 (patch)
treefa2197409bddcf6faaf084cb64895f4c531bfa73 /Documentation/power
parent0c0b6b7bc427caed77b172916edc3c36cd1ab79d (diff)
parent726fb6b4f2a82a14a906f39bdabac4863b87c01a (diff)
downloadlinux-next-cba630b6f5cf6bb468f5c2da77f3dee2125bd0c1.tar.gz
Merge branch 'pm-sleep' into pm-docs
Diffstat (limited to 'Documentation/power')
-rw-r--r--Documentation/power/states.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/power/states.txt b/Documentation/power/states.txt
index bc4548245a24..205e45ad7c65 100644
--- a/Documentation/power/states.txt
+++ b/Documentation/power/states.txt
@@ -35,7 +35,9 @@ only one way to cause the system to go into the Suspend-To-RAM state (write
The default suspend mode (ie. the one to be used without writing anything into
/sys/power/mem_sleep) is either "deep" (if Suspend-To-RAM is supported) or
"s2idle", but it can be overridden by the value of the "mem_sleep_default"
-parameter in the kernel command line.
+parameter in the kernel command line. On some ACPI-based systems, depending on
+the information in the FADT, the default may be "s2idle" even if Suspend-To-RAM
+is supported.
The properties of all of the sleep states are described below.