diff options
| author |   Petr Mladek <pmladek@suse.com> | 2021-08-30 14:56:06 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2021-08-30 14:56:06 +0200 |
| commit | 71af75b6929458d85f63c0649dc26d6f4c19729e (patch) | |
| tree | c05c57903424d8270f6b6f3ec3493791fdba4e5c /kernel/power/hibernate.c | |
| parent | lib/test_scanf: Handle n_bits == 0 in random tests (diff) | |
| parent | printk/index: Fix -Wunused-function warning (diff) | |
| download | wireguard-linux-71af75b6929458d85f63c0649dc26d6f4c19729e.tar.xz wireguard-linux-71af75b6929458d85f63c0649dc26d6f4c19729e.zip | |
Merge branch 'for-5.15-printk-index' into for-linus
Diffstat (limited to '')
| -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(); } /** |