diff options
| author | Ingo Molnar <mingo@kernel.org> | 2021-08-17 16:16:29 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-08-17 16:16:29 +0200 |
| commit | c87866ede44ad7da6b296d732221dc34ce1b154d (patch) | |
| tree | 2df013f6824e9252a1b30b1ea7f1681e454c6218 /kernel/power/hibernate.c | |
| parent | 55bccf1f93e4bf1b3209cc8648ab53f10f4601a5 (diff) | |
| parent | 7c60610d476766e128cc4284bb6349732cbd6606 (diff) | |
Merge tag 'v5.14-rc6' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/power/hibernate.c')
| -rw-r--r-- | kernel/power/hibernate.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index da0b41914177..559acef3fddb 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -31,6 +31,7 @@ #include <linux/genhd.h> #include <linux/ktime.h> #include <linux/security.h> +#include <linux/secretmem.h> #include <trace/events/power.h> #include "power.h" @@ -81,7 +82,9 @@ void hibernate_release(void) bool hibernation_available(void) { - return nohibernate == 0 && !security_locked_down(LOCKDOWN_HIBERNATION); + return nohibernate == 0 && + !security_locked_down(LOCKDOWN_HIBERNATION) && + !secretmem_active(); } /** |