diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-10 13:43:09 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-10 13:43:09 -0400 |
| commit | a7144b23da073f4b3192e356ad74de12aba60e00 (patch) | |
| tree | 2b93bdf54563bfe447a167d832c43d24f56c7a95 /kernel/sys.c | |
| parent | 8a60a07129fad60bba779a2a4038c7518b167fc7 (diff) | |
| parent | 86b3786078d63242d3194ffc58ae8dae1d1bbef3 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'kernel/sys.c')
| -rw-r--r-- | kernel/sys.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/sys.c b/kernel/sys.c index 000e81ad2c1..0bcaed6560a 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -404,7 +404,6 @@ void kernel_halt(void) { notifier_call_chain(&reboot_notifier_list, SYS_HALT, NULL); system_state = SYSTEM_HALT; - device_suspend(PMSG_SUSPEND); device_shutdown(); printk(KERN_EMERG "System halted.\n"); machine_halt(); @@ -415,7 +414,6 @@ void kernel_power_off(void) { notifier_call_chain(&reboot_notifier_list, SYS_POWER_OFF, NULL); system_state = SYSTEM_POWER_OFF; - device_suspend(PMSG_SUSPEND); device_shutdown(); printk(KERN_EMERG "Power down.\n"); machine_power_off(); |