diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2020-05-19 15:50:34 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2020-05-19 15:50:34 +0200 |
| commit | 1ed0948eea079a4c802d08cdb2e8db1eee0860f1 (patch) | |
| tree | cf7d2861d1557a305b0c7786661b9e99c343d215 /kernel/power/hibernate.c | |
| parent | 68f0f2690e183306b52671a9ad09fb31808b0500 (diff) | |
| parent | 6553896666433e7efec589838b400a2a652b3ffa (diff) | |
| download | linux-1ed0948eea079a4c802d08cdb2e8db1eee0860f1.tar.gz linux-1ed0948eea079a4c802d08cdb2e8db1eee0860f1.tar.bz2 linux-1ed0948eea079a4c802d08cdb2e8db1eee0860f1.zip | |
Merge tag 'noinstr-lds-2020-05-19' into core/rcu
Get the noinstr section and annotation markers to base the RCU parts on.
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: |