summaryrefslogtreecommitdiff
path: root/Documentation/kernel-parameters.txt
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-04-10 13:01:59 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-04-10 13:01:59 +0300
commitbe770021011f00bd6220c87876292053221ca5f1 (patch)
tree004a568289a595082119064edf07503170153c19 /Documentation/kernel-parameters.txt
parente5e02de0665ef2477e7a018193051387c6fe0fbc (diff)
parentf321c9cbf3bbf86f6e6153419eaf93ad085e3d74 (diff)
downloadlinux-be770021011f00bd6220c87876292053221ca5f1.tar.xz
Merge back earlier suspend/hibernate material for v4.1.
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r--Documentation/kernel-parameters.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index bfcb1a62a7b4..8b1fa5e129ac 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -3462,6 +3462,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
improve throughput, but will also increase the
amount of memory reserved for use by the client.
+ suspend.pm_test_delay=
+ [SUSPEND]
+ Sets the number of seconds to remain in a suspend test
+ mode before resuming the system (see
+ /sys/power/pm_test). Only available when CONFIG_PM_DEBUG
+ is set. Default value is 5.
+
swapaccount=[0|1]
[KNL] Enable accounting of swap in memory resource
controller if no parameter or 1 is given or disable