diff options
Diffstat (limited to 'kernel/power/hibernate.c')
-rw-r--r-- | kernel/power/hibernate.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index 258f492f0347..fcc2611d3f14 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c | |||
@@ -1153,6 +1153,11 @@ static int __init nohibernate_setup(char *str) | |||
1153 | return 1; | 1153 | return 1; |
1154 | } | 1154 | } |
1155 | 1155 | ||
1156 | static int __init kaslr_nohibernate_setup(char *str) | ||
1157 | { | ||
1158 | return nohibernate_setup(str); | ||
1159 | } | ||
1160 | |||
1156 | __setup("noresume", noresume_setup); | 1161 | __setup("noresume", noresume_setup); |
1157 | __setup("resume_offset=", resume_offset_setup); | 1162 | __setup("resume_offset=", resume_offset_setup); |
1158 | __setup("resume=", resume_setup); | 1163 | __setup("resume=", resume_setup); |
@@ -1160,3 +1165,4 @@ __setup("hibernate=", hibernate_setup); | |||
1160 | __setup("resumewait", resumewait_setup); | 1165 | __setup("resumewait", resumewait_setup); |
1161 | __setup("resumedelay=", resumedelay_setup); | 1166 | __setup("resumedelay=", resumedelay_setup); |
1162 | __setup("nohibernate", nohibernate_setup); | 1167 | __setup("nohibernate", nohibernate_setup); |
1168 | __setup("kaslr", kaslr_nohibernate_setup); | ||