lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] swpsuspend: Have suspend to disk use factors of sys_reboot

Browse Source 
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>
This commit is contained in:
Eric W. Biederman
2005-07-26 12:01:17 -06:00
committed by Linus Torvalds
parent 804ebf46d5
commit fdde86ac50
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
kernel/power/disk.c
View File

@@ -59,16 +59,13 @@ static void power_down(suspend_disk_method_t mode)
error = pm_ops->enter(PM_SUSPEND_DISK); error = pm_ops->enter(PM_SUSPEND_DISK);
break; break;
case PM_DISK_SHUTDOWN: case PM_DISK_SHUTDOWN:
printk("Powering off system\n"); kernel_power_off();
device_shutdown();
machine_power_off();
break; break;
case PM_DISK_REBOOT: case PM_DISK_REBOOT:
device_shutdown(); kernel_restart(NULL);
machine_restart(NULL);
break; break;
} }
machine_halt(); kernel_halt();
/* Valid image is on the disk, if we continue we risk serious data corruption /* Valid image is on the disk, if we continue we risk serious data corruption
after resume. */ after resume. */
printk(KERN_CRIT "Please power me down manually\n"); printk(KERN_CRIT "Please power me down manually\n");