aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/power/main.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-01-15 23:17:00 -0500
committerLen Brown <len.brown@intel.com>2008-02-01 18:30:58 -0500
commitb28f508112c584cdfbb4d8a9489cc4b79dac68ee (patch)
tree8269d53055d0368f6eb25fac6b9d29077382cbca /kernel/power/main.c
parentc9b6c8f68ee48e1e3dbb53e13316757e2c0b584d (diff)
Suspend: Add config option to disable the freezer if architecture wants that
This patch makes the freezer optional for suspend to allow the system to work (or not work) like the original PMU suspend. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Acked-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'kernel/power/main.c')
-rw-r--r--kernel/power/main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c
index d9bba452764b..e47214cfeb2d 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -181,7 +181,7 @@ static int suspend_prepare(void)
181 181
182 pm_prepare_console(); 182 pm_prepare_console();
183 183
184 if (freeze_processes()) { 184 if (suspend_freeze_processes()) {
185 error = -EAGAIN; 185 error = -EAGAIN;
186 goto Thaw; 186 goto Thaw;
187 } 187 }
@@ -199,7 +199,7 @@ static int suspend_prepare(void)
199 return 0; 199 return 0;
200 200
201 Thaw: 201 Thaw:
202 thaw_processes(); 202 suspend_thaw_processes();
203 pm_restore_console(); 203 pm_restore_console();
204 Finish: 204 Finish:
205 pm_notifier_call_chain(PM_POST_SUSPEND); 205 pm_notifier_call_chain(PM_POST_SUSPEND);
@@ -308,7 +308,7 @@ int suspend_devices_and_enter(suspend_state_t state)
308 */ 308 */
309static void suspend_finish(void) 309static void suspend_finish(void)
310{ 310{
311 thaw_processes(); 311 suspend_thaw_processes();
312 pm_restore_console(); 312 pm_restore_console();
313 pm_notifier_call_chain(PM_POST_SUSPEND); 313 pm_notifier_call_chain(PM_POST_SUSPEND);
314} 314}