diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-20 03:16:01 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-20 03:16:01 +0200 |
| commit | 557240b48e2dc4f6fa878afc3fc767ad745ca7ed (patch) | |
| tree | 354e9de17c28b438db675f6a2b779415f1634c45 /kernel/power/main.c | |
| parent | Make sure to re-enable SCI after an ACPI suspend (diff) | |
| download | linux-557240b48e2dc4f6fa878afc3fc767ad745ca7ed.tar.xz linux-557240b48e2dc4f6fa878afc3fc767ad745ca7ed.zip | |
Add support for suspending and resuming the whole console subsystem
Trying to suspend/resume with console messages flying all around is
doomed to failure, when the devices that the messages are trying to
go to are being shut down.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/power/main.c')
| -rw-r--r-- | kernel/power/main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c index a6d9ef46009e..0a907f0dc56b 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c @@ -86,6 +86,7 @@ static int suspend_prepare(suspend_state_t state) goto Thaw; } + suspend_console(); if ((error = device_suspend(PMSG_SUSPEND))) { printk(KERN_ERR "Some devices failed to suspend\n"); goto Finish; @@ -133,6 +134,7 @@ int suspend_enter(suspend_state_t state) static void suspend_finish(suspend_state_t state) { device_resume(); + resume_console(); thaw_processes(); enable_nonboot_cpus(); if (pm_ops && pm_ops->finish) |