diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2008-01-15 23:17:00 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-02-01 18:30:58 -0500 |
| commit | b28f508112c584cdfbb4d8a9489cc4b79dac68ee (patch) | |
| tree | 8269d53055d0368f6eb25fac6b9d29077382cbca /kernel/power/main.c | |
| parent | c9b6c8f68ee48e1e3dbb53e13316757e2c0b584d (diff) | |
| download | blackbird-op-linux-b28f508112c584cdfbb4d8a9489cc4b79dac68ee.tar.gz blackbird-op-linux-b28f508112c584cdfbb4d8a9489cc4b79dac68ee.zip | |
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.c | 6 |
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) pm_prepare_console(); - if (freeze_processes()) { + if (suspend_freeze_processes()) { error = -EAGAIN; goto Thaw; } @@ -199,7 +199,7 @@ static int suspend_prepare(void) return 0; Thaw: - thaw_processes(); + suspend_thaw_processes(); pm_restore_console(); Finish: pm_notifier_call_chain(PM_POST_SUSPEND); @@ -308,7 +308,7 @@ int suspend_devices_and_enter(suspend_state_t state) */ static void suspend_finish(void) { - thaw_processes(); + suspend_thaw_processes(); pm_restore_console(); pm_notifier_call_chain(PM_POST_SUSPEND); } |
