diff options
| author | Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com> | 2012-02-04 22:26:38 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-02-09 23:55:54 +0100 |
| commit | 51d6ff7acd920379f54d0be4dbe844a46178a65f (patch) | |
| tree | b016233eaf9dd4f1698ca6e8e649d1df905a48ec /kernel/power/user.c | |
| parent | 9045a05044268b075c13bb0284601b24959dc3c6 (diff) | |
| download | linux-stable-51d6ff7acd920379f54d0be4dbe844a46178a65f.tar.gz linux-stable-51d6ff7acd920379f54d0be4dbe844a46178a65f.tar.bz2 linux-stable-51d6ff7acd920379f54d0be4dbe844a46178a65f.zip | |
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>
Diffstat (limited to 'kernel/power/user.c')
| -rw-r--r-- | kernel/power/user.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/kernel/power/user.c b/kernel/power/user.c index 3e100075b13c..7bee91f9af51 100644 --- a/kernel/power/user.c +++ b/kernel/power/user.c @@ -249,16 +249,12 @@ static long snapshot_ioctl(struct file *filp, unsigned int cmd, } pm_restore_gfp_mask(); error = hibernation_snapshot(data->platform_support); - if (error) { - thaw_kernel_threads(); - } else { + if (!error) { error = put_user(in_suspend, (int __user *)arg); if (!error && !freezer_test_done) data->ready = 1; - if (freezer_test_done) { + if (freezer_test_done) freezer_test_done = false; - thaw_kernel_threads(); - } } break; |