OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PM / Hibernate: Thaw kernel threads in hibernation_snapshot() in error/test path 

In the hibernation call path, the kernel threads are frozen inside
hibernation_snapshot(). If we happen to encounter an error further down
the road or if we are exiting early due to a successful freezer test,
then thaw kernel threads before returning to the caller.

Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
This commit is contained in:
Srivatsa S. Bhat 2012-02-04 22:26:38 +01:00 committed by Rafael J. Wysocki
parent 9045a05044
commit 51d6ff7acd
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/power/hibernate.c
View File

@ -343,13 +343,13 @@ int hibernation_snapshot(int platform_mode)
* successful freezer test. * successful freezer test.
*/ */
freezer_test_done = true; freezer_test_done = true;
goto Cleanup; goto Thaw;
} }
error = dpm_prepare(PMSG_FREEZE); error = dpm_prepare(PMSG_FREEZE);
if (error) { if (error) {
dpm_complete(PMSG_RECOVER); dpm_complete(PMSG_RECOVER);
goto Cleanup; goto Thaw;
} }
suspend_console(); suspend_console();
@ -385,6 +385,8 @@ int hibernation_snapshot(int platform_mode)
platform_end(platform_mode); platform_end(platform_mode);
return error; return error;
Thaw:
thaw_kernel_threads();
Cleanup: Cleanup:
swsusp_free(); swsusp_free();
goto Close; goto Close;

8
kernel/power/user.c
View File

@ -249,16 +249,12 @@ static long snapshot_ioctl(struct file *filp, unsigned int cmd,
} }
pm_restore_gfp_mask(); pm_restore_gfp_mask();
error = hibernation_snapshot(data->platform_support); error = hibernation_snapshot(data->platform_support);
if (error) { if (!error) {
thaw_kernel_threads();
} else {
error = put_user(in_suspend, (int __user *)arg); error = put_user(in_suspend, (int __user *)arg);
if (!error && !freezer_test_done) if (!error && !freezer_test_done)
data->ready = 1; data->ready = 1;
if (freezer_test_done) { if (freezer_test_done)
freezer_test_done = false; freezer_test_done = false;
thaw_kernel_threads();
}
} }
break; break;