From e62fbe8482a29577aec4055f7d7a1b13113d9b2a Mon Sep 17 00:00:00 2001
From: "Srivatsa S. Bhat" <srivatsa.bhat@linux.vnet.ibm.com>
Date: Thu, 1 Dec 2011 22:33:10 +0100
Subject: [PATCH] --- yaml --- r: 280358 b: refs/heads/master c:
 97819a26224f019e73d88bb2fd4eb5a614860461 h: refs/heads/master v: v3

---
 [refs]                         |  2 +-
 trunk/kernel/power/hibernate.c |  2 +-
 trunk/kernel/power/power.h     |  2 ++
 trunk/kernel/power/user.c      | 11 ++++++++---
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 66198f0bec5a..29b92f815cf8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0118521cc7acb3ccbc1a01d6144ac32be9d56a4c
+refs/heads/master: 97819a26224f019e73d88bb2fd4eb5a614860461
diff --git a/trunk/kernel/power/hibernate.c b/trunk/kernel/power/hibernate.c
index 1fcf9de4506d..c10cb0f916e2 100644
--- a/trunk/kernel/power/hibernate.c
+++ b/trunk/kernel/power/hibernate.c
@@ -55,7 +55,7 @@ enum {
 
 static int hibernation_mode = HIBERNATION_SHUTDOWN;
 
-static bool freezer_test_done;
+bool freezer_test_done;
 
 static const struct platform_hibernation_ops *hibernation_ops;
 
diff --git a/trunk/kernel/power/power.h b/trunk/kernel/power/power.h
index 23a2db1ec442..0c4defe6d3b8 100644
--- a/trunk/kernel/power/power.h
+++ b/trunk/kernel/power/power.h
@@ -50,6 +50,8 @@ static inline char *check_image_kernel(struct swsusp_info *info)
 #define SPARE_PAGES	((1024 * 1024) >> PAGE_SHIFT)
 
 /* kernel/power/hibernate.c */
+extern bool freezer_test_done;
+
 extern int hibernation_snapshot(int platform_mode);
 extern int hibernation_restore(int platform_mode);
 extern int hibernation_platform_enter(void);
diff --git a/trunk/kernel/power/user.c b/trunk/kernel/power/user.c
index 6d8f535c2b88..e2aff0fc2697 100644
--- a/trunk/kernel/power/user.c
+++ b/trunk/kernel/power/user.c
@@ -283,10 +283,15 @@ static long snapshot_ioctl(struct file *filp, unsigned int cmd,
 		}
 		pm_restore_gfp_mask();
 		error = hibernation_snapshot(data->platform_support);
-		if (!error)
+		if (!error) {
 			error = put_user(in_suspend, (int __user *)arg);
-		if (!error)
-			data->ready = 1;
+			if (!error && !freezer_test_done)
+				data->ready = 1;
+			if (freezer_test_done) {
+				freezer_test_done = false;
+				thaw_processes();
+			}
+		}
 		break;
 
 	case SNAPSHOT_ATOMIC_RESTORE: