From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Tue, 10 May 2011 19:10:01 +0000 (+0200)
Subject: PM / Hibernate: Make snapshot_release() restore GFP mask
X-Git-Tag: v3.0~845^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9744997a8a2280e67984d4bffd87221d24f3b6b1;p=platform%2Fkernel%2Flinux-amlogic.git

PM / Hibernate: Make snapshot_release() restore GFP mask

If the process using the hibernate user space interface closes
/dev/snapshot after creating a hibernation image without thawing
tasks, snapshot_release() should call pm_restore_gfp_mask() to
restore the GFP mask used before the creation of the image.  Make
that happen.

Tested-by: Alexandre Felipe Muller de Souza <alexandrefm@mandriva.com.br>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Cc: stable@kernel.org
---

diff --git a/kernel/power/user.c b/kernel/power/user.c
index c36c3b9..6522be9 100644
--- a/kernel/power/user.c
+++ b/kernel/power/user.c
@@ -135,8 +135,10 @@ static int snapshot_release(struct inode *inode, struct file *filp)
 	free_basic_memory_bitmaps();
 	data = filp->private_data;
 	free_all_swap_pages(data->swap);
-	if (data->frozen)
+	if (data->frozen) {
+		pm_restore_gfp_mask();
 		thaw_processes();
+	}
 	pm_notifier_call_chain(data->mode == O_RDONLY ?
 			PM_POST_HIBERNATION : PM_POST_RESTORE);
 	atomic_inc(&snapshot_device_available);