[PATCH 1/3] Suspend: Invoke suspend notifications after console switch

Rafael J. Wysocki
2008-01-11T00:25:31Z

From: Johannes Berg <johannes@sipsolutions.net>

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>
---
kernel/power/main.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

Index: linux-2.6/kernel/power/main.c
===================================================================
--- linux-2.6.orig/kernel/power/main.c
+++ linux-2.6/kernel/power/main.c
@@ -173,12 +173,12 @@ static int suspend_prepare(void)
if (!suspend_ops || !suspend_ops->enter)
return -EPERM;

+ pm_prepare_console();
+
error = pm_notifier_call_chain(PM_SUSPEND_PREPARE);
if (error)
goto Finish;

- pm_prepare_console();
-
if (suspend_freeze_processes()) {
error = -EAGAIN;
goto Thaw;
@@ -198,9 +198,9 @@ static int suspend_prepare(void)

Thaw:
suspend_thaw_processes();
- pm_restore_console();
Finish:
pm_notifier_call_chain(PM_POST_SUSPEND);
+ pm_restore_console();
return error;
}

@@ -307,8 +307,8 @@ int suspend_devices_and_enter(suspend_st
static void suspend_finish(void)
{
suspend_thaw_processes();
- pm_restore_console();
pm_notifier_call_chain(PM_POST_SUSPEND);
+ pm_restore_console();
}