diff options
author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-28 10:03:36 -0400 |
---|---|---|
committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-28 10:03:36 -0400 |
commit | da28c12089dfcfb8695b6b555cdb8e03dda2b690 (patch) | |
tree | b3ff509f21352ef053cb3d490cb13528090d32ac /kernel/sys.c | |
parent | 6de7dc2c4c713d037c19aa1e310d240f16973414 (diff) | |
parent | 577a4f8102d54b504cb22eb021b89e957e8df18f (diff) |
Merge with /home/shaggy/git/linus-clean/
/home/shaggy/git/linus-clean/
/home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
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 a74039036fb4..8f255259ef9e 100644 --- a/kernel/sys.c +++ b/kernel/sys.c | |||
@@ -371,7 +371,6 @@ void kernel_restart(char *cmd) | |||
371 | { | 371 | { |
372 | notifier_call_chain(&reboot_notifier_list, SYS_RESTART, cmd); | 372 | notifier_call_chain(&reboot_notifier_list, SYS_RESTART, cmd); |
373 | system_state = SYSTEM_RESTART; | 373 | system_state = SYSTEM_RESTART; |
374 | device_suspend(PMSG_FREEZE); | ||
375 | device_shutdown(); | 374 | device_shutdown(); |
376 | if (!cmd) { | 375 | if (!cmd) { |
377 | printk(KERN_EMERG "Restarting system.\n"); | 376 | printk(KERN_EMERG "Restarting system.\n"); |