aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2014-06-13 16:30:35 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-06-16 17:29:39 -0400
commita6e15a39048ec3229b9a53425f4384f55f6cc1b3 (patch)
treed1f8a005d2b6e85f781f2c9a4ba899614ec55ed8 /Documentation
parent7171511eaec5bf23fb06078f59784a3a0626b38f (diff)
PM / hibernate: introduce "nohibernate" boot parameter
To support using kernel features that are not compatible with hibernation, this creates the "nohibernate" kernel boot parameter to disable both hibernation and resume. This allows hibernation support to be a boot-time choice instead of only a compile-time choice. Signed-off-by: Kees Cook <keescook@chromium.org> Acked-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'Documentation')
-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 6eaa9cdb7094..f8f0466b8b1d 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -2184,6 +2184,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
2184 in certain environments such as networked servers or 2184 in certain environments such as networked servers or
2185 real-time systems. 2185 real-time systems.
2186 2186
2187 nohibernate [HIBERNATION] Disable hibernation and resume.
2188
2187 nohz= [KNL] Boottime enable/disable dynamic ticks 2189 nohz= [KNL] Boottime enable/disable dynamic ticks
2188 Valid arguments: on, off 2190 Valid arguments: on, off
2189 Default: on 2191 Default: on
@@ -2980,6 +2982,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
2980 noresume Don't check if there's a hibernation image 2982 noresume Don't check if there's a hibernation image
2981 present during boot. 2983 present during boot.
2982 nocompress Don't compress/decompress hibernation images. 2984 nocompress Don't compress/decompress hibernation images.
2985 no Disable hibernation and resume.
2983 2986
2984 retain_initrd [RAM] Keep initrd memory after extraction 2987 retain_initrd [RAM] Keep initrd memory after extraction
2985 2988