diff options
| author |   Tony Lindgren <tony@atomide.com> | 2021-07-27 11:25:08 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2021-07-27 11:25:08 +0300 |
| commit | 353b7a55dcaf5fb8758e09ebe2ddf5f3adbac7c5 (patch) | |
| tree | 081200957b3d8925cbe913020d45a4e3ba61a7a3 /kernel/power/hibernate.c | |
| parent | bus: ti-sysc: Fix gpt12 system timer issue with reserved status (diff) | |
| parent | omap5-board-common: remove not physically existing vdds_1v8_main fixed-regulator (diff) | |
| download | wireguard-linux-353b7a55dcaf5fb8758e09ebe2ddf5f3adbac7c5.tar.xz wireguard-linux-353b7a55dcaf5fb8758e09ebe2ddf5f3adbac7c5.zip | |
Merge branch 'fixes-v5.14' into fixes
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(); } /** |