From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 27 Mar 2012 17:34:51 +0000 (-0700)
Subject: 3.2-stable patches
X-Git-Tag: v3.0.27~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=abf9d614f7cc44c2c3be7b33642182da62dd67eb;p=thirdparty%2Fkernel%2Fstable-queue.git

3.2-stable patches

added patches:
	pm-hibernate-enable-usermodehelpers-in-hibernate-error-path.patch
---

diff --git a/queue-3.2/pm-hibernate-enable-usermodehelpers-in-hibernate-error-path.patch b/queue-3.2/pm-hibernate-enable-usermodehelpers-in-hibernate-error-path.patch
new file mode 100644
index 00000000000..1ed6d793122
--- /dev/null
+++ b/queue-3.2/pm-hibernate-enable-usermodehelpers-in-hibernate-error-path.patch
@@ -0,0 +1,52 @@
+From 05b4877f6a4f1ba4952d1222213d262bf8c132b7 Mon Sep 17 00:00:00 2001
+From: "Srivatsa S. Bhat" <srivatsa.bhat@linux.vnet.ibm.com>
+Date: Fri, 17 Feb 2012 23:39:51 +0100
+Subject: PM / Hibernate: Enable usermodehelpers in hibernate() error path
+
+From: "Srivatsa S. Bhat" <srivatsa.bhat@linux.vnet.ibm.com>
+
+commit 05b4877f6a4f1ba4952d1222213d262bf8c132b7 upstream.
+
+If create_basic_memory_bitmaps() fails, usermodehelpers are not re-enabled
+before returning. Fix this. And while at it, reword the goto labels so that
+they look more meaningful.
+
+Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
+Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ kernel/power/hibernate.c |    7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+--- a/kernel/power/hibernate.c
++++ b/kernel/power/hibernate.c
+@@ -648,7 +648,7 @@ int hibernate(void)
+ 	/* Allocate memory management structures */
+ 	error = create_basic_memory_bitmaps();
+ 	if (error)
+-		goto Exit;
++		goto Enable_umh;
+ 
+ 	printk(KERN_INFO "PM: Syncing filesystems ... ");
+ 	sys_sync();
+@@ -656,7 +656,7 @@ int hibernate(void)
+ 
+ 	error = prepare_processes();
+ 	if (error)
+-		goto Finish;
++		goto Free_bitmaps;
+ 
+ 	error = hibernation_snapshot(hibernation_mode == HIBERNATION_PLATFORM);
+ 	if (error)
+@@ -689,8 +689,9 @@ int hibernate(void)
+ 
+  Thaw:
+ 	thaw_processes();
+- Finish:
++ Free_bitmaps:
+ 	free_basic_memory_bitmaps();
++ Enable_umh:
+ 	usermodehelper_enable();
+  Exit:
+ 	pm_notifier_call_chain(PM_POST_HIBERNATION);
diff --git a/queue-3.2/series b/queue-3.2/series
index 71ced63f2de..df27a87b312 100644
--- a/queue-3.2/series
+++ b/queue-3.2/series
@@ -107,3 +107,4 @@ lgdt330x-fix-signedness-error-in-i2c_read_demod_bytes.patch
 pvrusb2-fix-7mhz-8mhz-dvb-t-tuner-support-for-hvr1900-rev-d1f5.patch
 mxl111sf-fix-error-on-stream-stop-in-mxl111sf_ep6_streaming_ctrl.patch
 nfsv4-rate-limit-the-state-manager-warning-messages.patch
+pm-hibernate-enable-usermodehelpers-in-hibernate-error-path.patch