diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2005-07-26 12:01:17 -0600 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-26 14:35:44 -0700 |
| commit | fdde86ac50357b6a811e3574e47d189e81a21444 (patch) | |
| tree | b5e8d3d295da10b84ba6538359e20c5435b3085a /kernel | |
| parent | 804ebf46d51653e736108074473d9493398f2df9 (diff) | |
| download | talos-obmc-linux-fdde86ac50357b6a811e3574e47d189e81a21444.tar.gz talos-obmc-linux-fdde86ac50357b6a811e3574e47d189e81a21444.zip | |
[PATCH] swpsuspend: Have suspend to disk use factors of sys_reboot
The suspend to disk code was a poor copy of the code in
sys_reboot now that we have kernel_power_off, kernel_restart
and kernel_halt use them instead of poorly duplicating them inline.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/power/disk.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/kernel/power/disk.c b/kernel/power/disk.c index 3ec789c6b537..664eb0469b6e 100644 --- a/kernel/power/disk.c +++ b/kernel/power/disk.c @@ -59,16 +59,13 @@ static void power_down(suspend_disk_method_t mode) error = pm_ops->enter(PM_SUSPEND_DISK); break; case PM_DISK_SHUTDOWN: - printk("Powering off system\n"); - device_shutdown(); - machine_power_off(); + kernel_power_off(); break; case PM_DISK_REBOOT: - device_shutdown(); - machine_restart(NULL); + kernel_restart(NULL); break; } - machine_halt(); + kernel_halt(); /* Valid image is on the disk, if we continue we risk serious data corruption after resume. */ printk(KERN_CRIT "Please power me down manually\n"); |
