From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Tue, 6 Dec 2011 21:12:50 +0000 (+0100)
Subject: Merge branch 'pm-freezer' into pm-sleep
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2e8e89e392c62636ee33532358607baef2863173;p=linux-beck.git

Merge branch 'pm-freezer' into pm-sleep

* pm-freezer: (26 commits)
  Freezer / sunrpc / NFS: don't allow TASK_KILLABLE sleeps to block the freezer
  Freezer: fix more fallout from the thaw_process rename
  freezer: fix wait_event_freezable/__thaw_task races
  freezer: kill unused set_freezable_with_signal()
  dmatest: don't use set_freezable_with_signal()
  usb_storage: don't use set_freezable_with_signal()
  freezer: remove unused @sig_only from freeze_task()
  freezer: use lock_task_sighand() in fake_signal_wake_up()
  freezer: restructure __refrigerator()
  freezer: fix set_freezable[_with_signal]() race
  freezer: remove should_send_signal() and update frozen()
  freezer: remove now unused TIF_FREEZE
  freezer: make freezing() test freeze conditions in effect instead of TIF_FREEZE
  cgroup_freezer: prepare for removal of TIF_FREEZE
  freezer: clean up freeze_processes() failure path
  freezer: kill PF_FREEZING
  freezer: test freezable conditions while holding freezer_lock
  freezer: make freezing indicate freeze condition in effect
  freezer: use dedicated lock instead of task_lock() + memory barrier
  freezer: don't distinguish nosig tasks on thaw
  ...
---

2e8e89e392c62636ee33532358607baef2863173
diff --cc kernel/power/hibernate.c
index 5314a94a92c1,e7ffa8952083..605149a6d219
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@@ -790,13 -800,11 +779,13 @@@ static int software_resume(void
  		goto close_finish;
  
  	error = create_basic_memory_bitmaps();
 -	if (error)
 +	if (error) {
 +		usermodehelper_enable();
  		goto close_finish;
 +	}
  
  	pr_debug("PM: Preparing processes for restore.\n");
- 	error = prepare_processes();
+ 	error = freeze_processes();
  	if (error) {
  		swsusp_close(FMODE_READ);
  		goto Done;