aboutsummaryrefslogtreecommitdiff
path: root/Documentation/kernel-parameters.txt
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-09-29 15:33:26 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-09-29 15:33:26 +0200
commit905563ff47db35dcb3f69e69d434207270ad1966 (patch)
treed5453957a05948e339d54a031536c8df4390673b /Documentation/kernel-parameters.txt
parentfe82dcec644244676d55a1384c958d5f67979adb (diff)
parent0cadc70282df0d957c00e8e68ba58afeefdf0f64 (diff)
Merge back earlier 'pm-sleep' material for v3.18.
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r--Documentation/kernel-parameters.txt10
1 files changed, 6 insertions, 4 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 10d51c2f10d7..ccbab5653bb8 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -3303,11 +3303,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
tdfx= [HW,DRM]
- test_suspend= [SUSPEND]
+ test_suspend= [SUSPEND][,N]
Specify "mem" (for Suspend-to-RAM) or "standby" (for
- standby suspend) as the system sleep state to briefly
- enter during system startup. The system is woken from
- this state using a wakeup-capable RTC alarm.
+ standby suspend) or "freeze" (for suspend type freeze)
+ as the system sleep state during system startup with
+ the optional capability to repeat N number of times.
+ The system is woken from this state using a
+ wakeup-capable RTC alarm.
thash_entries= [KNL,NET]
Set number of hash buckets for TCP connection