summaryrefslogtreecommitdiffstats
path: root/kernel/sys.c
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2005-07-27 19:41:23 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-28 01:46:37 +0200
commite4ff4d7f9d85a2bc714307eb9113617182e62845 (patch)
tree845bea10c10850e6bd842367aafddca66ca24a06 /kernel/sys.c
parentMerge head 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/shaggy/... (diff)
downloadlinux-e4ff4d7f9d85a2bc714307eb9113617182e62845.tar.xz
linux-e4ff4d7f9d85a2bc714307eb9113617182e62845.zip
[PATCH] Avoid device suspend on reboot
My fairly ordinary x86 test box gets stuck during reboot on the wait_for_completion() in ide_do_drive_cmd(): Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/sys.c')
-rw-r--r--kernel/sys.c1
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)
{
notifier_call_chain(&reboot_notifier_list, SYS_RESTART, cmd);
system_state = SYSTEM_RESTART;
- device_suspend(PMSG_FREEZE);
device_shutdown();
if (!cmd) {
printk(KERN_EMERG "Restarting system.\n");