diff options
| author |   Tony Lindgren <tony@atomide.com> | 2020-06-08 10:14:49 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2020-06-08 10:14:49 -0700 |
| commit | 4263eb6880df8383fff0efb872278a99eb6142c8 (patch) | |
| tree | 67ab9bf228e4f5f341f9408e055180932b39fe06 /kernel/power/hibernate.c | |
| parent | bus: ti-sysc: Increase max softreset wait (diff) | |
| parent | ARM: dts: dra7-evm-common: Fix duplicate mailbox nodes (diff) | |
| download | linux-dev-4263eb6880df8383fff0efb872278a99eb6142c8.tar.xz linux-dev-4263eb6880df8383fff0efb872278a99eb6142c8.zip | |
Merge branch 'fixes-v5.7' into fixes
Diffstat (limited to 'kernel/power/hibernate.c')
| -rw-r--r-- | kernel/power/hibernate.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index 86aba8706b16..30bd28d1d418 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -898,6 +898,13 @@ static int software_resume(void) error = freeze_processes(); if (error) goto Close_Finish; + + error = freeze_kernel_threads(); + if (error) { + thaw_processes(); + goto Close_Finish; + } + error = load_image_and_restore(); thaw_processes(); Finish: |