diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-07-28 04:30:20 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-07-28 04:30:20 -0400 |
| commit | 661299d9d0437a0ff72240f3d60016ac3a361a6e (patch) | |
| tree | 765512576314fc3612b503f182b9ae4e60fcf849 /kernel/sys.c | |
| parent | 05caac585f8abd6c0113856bc8858e3ef214d8a6 (diff) | |
| parent | 41c018b7ecb60b1c2c4d5dee0cd37d32a94c45af (diff) | |
Merge with Linus' 2.6 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 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"); |