diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-02 07:06:15 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-02 07:06:15 +0100 |
| commit | 59ed2f59e4ea6a32f9591e378da7935f713a7000 (patch) | |
| tree | a1276a611dbb1bc44685ef8af363e99603e60047 /kernel/power | |
| parent | [PATCH] compat: fix compat_sys_openat and friends (diff) | |
| parent | [ACPI] ACPICA 20060127 (diff) | |
| download | linux-59ed2f59e4ea6a32f9591e378da7935f713a7000.tar.xz linux-59ed2f59e4ea6a32f9591e378da7935f713a7000.zip | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
Diffstat (limited to 'kernel/power')
| -rw-r--r-- | kernel/power/disk.c | 9 | ||||
| -rw-r--r-- | kernel/power/main.c | 4 |
2 files changed, 3 insertions, 10 deletions
diff --git a/kernel/power/disk.c b/kernel/power/disk.c index f2b3b0ea512a..0b43847dc980 100644 --- a/kernel/power/disk.c +++ b/kernel/power/disk.c @@ -53,7 +53,7 @@ static void power_down(suspend_disk_method_t mode) switch(mode) { case PM_DISK_PLATFORM: - kernel_power_off_prepare(); + kernel_shutdown_prepare(SYSTEM_SUSPEND_DISK); error = pm_ops->enter(PM_SUSPEND_DISK); break; case PM_DISK_SHUTDOWN: @@ -95,13 +95,6 @@ static int prepare_processes(void) goto thaw; } - if (pm_disk_mode == PM_DISK_PLATFORM) { - if (pm_ops && pm_ops->prepare) { - if ((error = pm_ops->prepare(PM_SUSPEND_DISK))) - goto thaw; - } - } - /* Free memory before shutting down devices. */ if (!(error = swsusp_shrink_memory())) return 0; diff --git a/kernel/power/main.c b/kernel/power/main.c index d253f3ae2fa5..9cb235cba4a9 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c @@ -133,10 +133,10 @@ static int suspend_enter(suspend_state_t state) static void suspend_finish(suspend_state_t state) { device_resume(); - if (pm_ops && pm_ops->finish) - pm_ops->finish(state); thaw_processes(); enable_nonboot_cpus(); + if (pm_ops && pm_ops->finish) + pm_ops->finish(state); pm_restore_console(); } |