diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2008-01-11 01:25:21 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-02-02 00:30:59 +0100 |
| commit | 5a0a2f304612bd63948177fef05987f4bcaddcaf (patch) | |
| tree | 17a72bcefbb7806ed5e3627230d6d04fd5f06600 /kernel/power | |
| parent | Suspend: Invoke suspend notifications after console switch (diff) | |
| download | linux-5a0a2f304612bd63948177fef05987f4bcaddcaf.tar.xz linux-5a0a2f304612bd63948177fef05987f4bcaddcaf.zip | |
Hibernation: Invoke suspend notifications after console switch
Following the recent change in the suspend code path, switch consoles before
calling PM notifiers during hibernation.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'kernel/power')
| -rw-r--r-- | kernel/power/disk.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/kernel/power/disk.c b/kernel/power/disk.c index 53c22d9cf577..d09da0895174 100644 --- a/kernel/power/disk.c +++ b/kernel/power/disk.c @@ -458,20 +458,13 @@ static void power_down(void) while(1); } -static void unprepare_processes(void) -{ - thaw_processes(); - pm_restore_console(); -} - static int prepare_processes(void) { int error = 0; - pm_prepare_console(); if (freeze_processes()) { error = -EBUSY; - unprepare_processes(); + thaw_processes(); } return error; } @@ -491,6 +484,7 @@ int hibernate(void) goto Unlock; } + pm_prepare_console(); error = pm_notifier_call_chain(PM_HIBERNATION_PREPARE); if (error) goto Exit; @@ -530,11 +524,12 @@ int hibernate(void) swsusp_free(); } Thaw: - unprepare_processes(); + thaw_processes(); Finish: free_basic_memory_bitmaps(); Exit: pm_notifier_call_chain(PM_POST_HIBERNATION); + pm_restore_console(); atomic_inc(&snapshot_device_available); Unlock: mutex_unlock(&pm_mutex); @@ -603,6 +598,7 @@ static int software_resume(void) goto Unlock; } + pm_prepare_console(); error = pm_notifier_call_chain(PM_RESTORE_PREPARE); if (error) goto Finish; @@ -626,11 +622,12 @@ static int software_resume(void) printk(KERN_ERR "PM: Restore failed, recovering.\n"); swsusp_free(); - unprepare_processes(); + thaw_processes(); Done: free_basic_memory_bitmaps(); Finish: pm_notifier_call_chain(PM_POST_RESTORE); + pm_restore_console(); atomic_inc(&snapshot_device_available); /* For success case, the suspend path will release the lock */ Unlock: |