Commit c36f19e02a96488f550fdb678c92500afca3109b
Committed by
Linus Torvalds
1 parent
d95a1b4818
Exists in
master
and in
4 other branches
[PATCH] Remove suspend() calls from shutdown path
This removes the calls to device_suspend() from the shutdown path that were added sometime during 2.6.13-rc*. They aren't working properly on a number of configs (I got reports from both ppc powerbook users and x86 users) causing the system to not shutdown anymore. I think it isn't the right approach at the moment anyway. We have already a shutdown() callback for the drivers that actually care about shutdown and the suspend() code isn't yet in a good enough shape to be so much generalized. Also, the semantics of suspend and shutdown are slightly different on a number of setups and the way this was patched in provides little way for drivers to cleanly differenciate. It should have been at least a different message. For 2.6.13, I think we should revert to 2.6.12 behaviour and have a working suspend back. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Showing 1 changed file with 0 additions and 2 deletions Side-by-side Diff
kernel/sys.c
| ... | ... | @@ -404,7 +404,6 @@ |
| 404 | 404 | { |
| 405 | 405 | notifier_call_chain(&reboot_notifier_list, SYS_HALT, NULL); |
| 406 | 406 | system_state = SYSTEM_HALT; |
| 407 | - device_suspend(PMSG_SUSPEND); | |
| 408 | 407 | device_shutdown(); |
| 409 | 408 | printk(KERN_EMERG "System halted.\n"); |
| 410 | 409 | machine_halt(); |
| ... | ... | @@ -415,7 +414,6 @@ |
| 415 | 414 | { |
| 416 | 415 | notifier_call_chain(&reboot_notifier_list, SYS_POWER_OFF, NULL); |
| 417 | 416 | system_state = SYSTEM_POWER_OFF; |
| 418 | - device_suspend(PMSG_SUSPEND); | |
| 419 | 417 | device_shutdown(); |
| 420 | 418 | printk(KERN_EMERG "Power down.\n"); |
| 421 | 419 | machine_power_off(); |