lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Suspend: Invoke suspend notifications after console switch

Browse Source 
In order to fix APM emulation it is necessary to enable apm-emulation
notifications for suspends triggered in various ways via the suspend
notifiers.  However, this will cause the systems using APM emulation
to lock up between X being needed to switch away from the VT and X
already waiting for resume in the APM ioctl.

This patch moves the console switch (if enabled) before the suspend
notification (and after the resume notification) to avoid this issue.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Johannes Berg
2008-01-11 01:22:23 +01:00
committed by Len Brown
parent 17b7a89cfb
commit af258f516b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/power/main.c
View File

@@ -175,12 +175,12 @@ static int suspend_prepare(void)
if (!suspend_ops || !suspend_ops->enter) if (!suspend_ops || !suspend_ops->enter)
return -EPERM; return -EPERM;
pm_prepare_console();
error = pm_notifier_call_chain(PM_SUSPEND_PREPARE); error = pm_notifier_call_chain(PM_SUSPEND_PREPARE);
if (error) if (error)
goto Finish; goto Finish;
pm_prepare_console();
if (suspend_freeze_processes()) { if (suspend_freeze_processes()) {
error = -EAGAIN; error = -EAGAIN;
goto Thaw; goto Thaw;
@@ -200,9 +200,9 @@ static int suspend_prepare(void)
Thaw: Thaw:
suspend_thaw_processes(); suspend_thaw_processes();
pm_restore_console();
Finish: Finish:
pm_notifier_call_chain(PM_POST_SUSPEND); pm_notifier_call_chain(PM_POST_SUSPEND);
pm_restore_console();
return error; return error;
} }
@@ -309,8 +309,8 @@ int suspend_devices_and_enter(suspend_state_t state)
static void suspend_finish(void) static void suspend_finish(void)
{ {
suspend_thaw_processes(); suspend_thaw_processes();
pm_restore_console();
pm_notifier_call_chain(PM_POST_SUSPEND); pm_notifier_call_chain(PM_POST_SUSPEND);
pm_restore_console();
} }