3 files changed, 30 insertions, 1 deletions

diff --git a/kernel/power/process.c b/kernel/power/process.c
index 77274c9ba2f1..eeca00311f39 100644
--- a/kernel/power/process.c
+++ b/kernel/power/process.c
@@ -188,3 +188,22 @@ void thaw_processes(void)
         printk("done.\n");
 }
 
+void thaw_kernel_threads(void)
+{
+        struct task_struct *g, *p;
+
+        pm_nosig_freezing = false;
+        printk("Restarting kernel threads ... ");
+
+        thaw_workqueues();
+
+        read_lock(&tasklist_lock);
+        do_each_thread(g, p) {
+                if (p->flags & (PF_KTHREAD | PF_WQ_WORKER))
+                        __thaw_task(p);
+        } while_each_thread(g, p);
+        read_unlock(&tasklist_lock);
+
+        schedule();
+        printk("done.\n");
+}
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
index 1cf88900ec4f..6a768e537001 100644
--- a/kernel/power/snapshot.c
+++ b/kernel/power/snapshot.c
@@ -812,7 +812,8 @@ unsigned int snapshot_additional_pages(struct zone *zone)
         unsigned int res;
 
         res = DIV_ROUND_UP(zone->spanned_pages, BM_BITS_PER_BLOCK);
-        res += DIV_ROUND_UP(res * sizeof(struct bm_block), PAGE_SIZE);
+        res += DIV_ROUND_UP(res * sizeof(struct bm_block),
+                            LINKED_PAGE_DATA_SIZE);
         return 2 * res;
 }
 
diff --git a/kernel/power/user.c b/kernel/power/user.c
index 6b1ab7a88522..e5a21a857302 100644
--- a/kernel/power/user.c
+++ b/kernel/power/user.c
@@ -274,6 +274,15 @@ static long snapshot_ioctl(struct file *filp, unsigned int cmd,
                 swsusp_free();
                 memset(&data->handle, 0, sizeof(struct snapshot_handle));
                 data->ready = 0;
+                /*
+                 * It is necessary to thaw kernel threads here, because
+                 * SNAPSHOT_CREATE_IMAGE may be invoked directly after
+                 * SNAPSHOT_FREE.  In that case, if kernel threads were not
+                 * thawed, the preallocation of memory carried out by
+                 * hibernation_snapshot() might run into problems (i.e. it
+                 * might fail or even deadlock).
+                 */
+                thaw_kernel_threads();
                 break;
 
         case SNAPSHOT_PREF_IMAGE_SIZE: