diff options
| author | Len Brown <len.brown@intel.com> | 2005-07-30 01:55:32 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-07-30 01:55:32 -0400 |
| commit | adbedd34244e2b054557002817f979a9b004a405 (patch) | |
| tree | 78e4a524e84f8b3e23ae8b49ac689048584e4668 /kernel/sys.c | |
| parent | d6ac1a7910d22626bc77e73db091e00b810715f4 (diff) | |
| parent | b0825488a642cadcf39709961dde61440cb0731c (diff) | |
merge 2.6.13-rc4 with ACPI's to-linus tree
Diffstat (limited to 'kernel/sys.c')
| -rw-r--r-- | kernel/sys.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/sys.c b/kernel/sys.c index 8f255259ef9e..000e81ad2c1d 100644 --- a/kernel/sys.c +++ b/kernel/sys.c | |||
| @@ -392,7 +392,6 @@ void kernel_kexec(void) | |||
| 392 | } | 392 | } |
| 393 | notifier_call_chain(&reboot_notifier_list, SYS_RESTART, NULL); | 393 | notifier_call_chain(&reboot_notifier_list, SYS_RESTART, NULL); |
| 394 | system_state = SYSTEM_RESTART; | 394 | system_state = SYSTEM_RESTART; |
| 395 | device_suspend(PMSG_FREEZE); | ||
| 396 | device_shutdown(); | 395 | device_shutdown(); |
| 397 | printk(KERN_EMERG "Starting new kernel\n"); | 396 | printk(KERN_EMERG "Starting new kernel\n"); |
| 398 | machine_shutdown(); | 397 | machine_shutdown(); |