aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/kernel-parameters.txt
diff options
context:
space:
mode:
authorBarry Song <baohua.song@csr.com>2011-10-10 17:38:41 -0400
committerRafael J. Wysocki <rjw@sisk.pl>2011-10-16 17:30:37 -0400
commitf126f7334f72e2fd1b7a62bba20c488b86e6e7c4 (patch)
treec56a286700df963245e56cb8caea3e96565b478b /Documentation/kernel-parameters.txt
parentbf1c138e350155edb06709c7fbf0946f252b257c (diff)
PM / Hibernate: Add resumedelay kernel param in addition to resumewait
Patch "PM / Hibernate: Add resumewait param to support MMC-like devices as resume file" added the resumewait kernel command line option. The present patch adds resumedelay so that resumewait/delay were analogous to rootwait/delay. [rjw: Modified the subject and changelog slightly.] Signed-off-by: Barry Song <baohua.song@csr.com> Acked-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r--Documentation/kernel-parameters.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 88a7b197a4eb..831bde222bde 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -2240,6 +2240,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
2240 in <PAGE_SIZE> units (needed only for swap files). 2240 in <PAGE_SIZE> units (needed only for swap files).
2241 See Documentation/power/swsusp-and-swap-files.txt 2241 See Documentation/power/swsusp-and-swap-files.txt
2242 2242
2243 resumedelay= [HIBERNATION] Delay (in seconds) to pause before attempting to
2244 read the resume files
2245
2243 resumewait [HIBERNATION] Wait (indefinitely) for resume device to show up. 2246 resumewait [HIBERNATION] Wait (indefinitely) for resume device to show up.
2244 Useful for devices that are detected asynchronously 2247 Useful for devices that are detected asynchronously
2245 (e.g. USB and MMC devices). 2248 (e.g. USB and MMC devices).