diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2005-07-26 13:21:38 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-26 17:35:41 -0400 |
| commit | 47f61f397cc08b5a9a815bd03cb10c48dab66034 (patch) | |
| tree | 747b69851f018f80ae8f7dcf512cb8f6d43eae02 /kernel | |
| parent | a6fa657b9d5c892c6a92912632c4b5715955b4f8 (diff) | |
[PATCH] Add missing device_suspsend(PMSG_FREEZE) calls.
In the recent addition of device_suspend calls into
sys_reboot two code paths were missed.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sys.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/sys.c b/kernel/sys.c index 9a24374c23bc..5fc10d3e3891 100644 --- a/kernel/sys.c +++ b/kernel/sys.c | |||
| @@ -391,6 +391,7 @@ asmlinkage long sys_reboot(int magic1, int magic2, unsigned int cmd, void __user | |||
| 391 | case LINUX_REBOOT_CMD_RESTART: | 391 | case LINUX_REBOOT_CMD_RESTART: |
| 392 | notifier_call_chain(&reboot_notifier_list, SYS_RESTART, NULL); | 392 | notifier_call_chain(&reboot_notifier_list, SYS_RESTART, NULL); |
| 393 | system_state = SYSTEM_RESTART; | 393 | system_state = SYSTEM_RESTART; |
| 394 | device_suspend(PMSG_FREEZE); | ||
| 394 | device_shutdown(); | 395 | device_shutdown(); |
| 395 | printk(KERN_EMERG "Restarting system.\n"); | 396 | printk(KERN_EMERG "Restarting system.\n"); |
| 396 | machine_restart(NULL); | 397 | machine_restart(NULL); |
| @@ -452,6 +453,7 @@ asmlinkage long sys_reboot(int magic1, int magic2, unsigned int cmd, void __user | |||
| 452 | } | 453 | } |
| 453 | notifier_call_chain(&reboot_notifier_list, SYS_RESTART, NULL); | 454 | notifier_call_chain(&reboot_notifier_list, SYS_RESTART, NULL); |
| 454 | system_state = SYSTEM_RESTART; | 455 | system_state = SYSTEM_RESTART; |
| 456 | device_suspend(PMSG_FREEZE); | ||
| 455 | device_shutdown(); | 457 | device_shutdown(); |
| 456 | printk(KERN_EMERG "Starting new kernel\n"); | 458 | printk(KERN_EMERG "Starting new kernel\n"); |
| 457 | machine_shutdown(); | 459 | machine_shutdown(); |
