Commit:     af258f516b3e4e214121f5d6d53cab32ce0d8010
Parent:     17b7a89cfb6ea2ff103785f9b2580e5138b6cfd1
Author:     Johannes Berg <[EMAIL PROTECTED]>
AuthorDate: Fri Jan 11 01:22:23 2008 +0100
Committer:  Len Brown <[EMAIL PROTECTED]>
CommitDate: Fri Feb 1 18:30:58 2008 -0500

    Suspend: Invoke suspend notifications after console switch
    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 <[EMAIL PROTECTED]>
    Signed-off-by: Rafael J. Wysocki <[EMAIL PROTECTED]>
    Signed-off-by: Len Brown <[EMAIL PROTECTED]>
 kernel/power/main.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kernel/power/main.c b/kernel/power/main.c
index e47214c..6a6d5eb 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -175,12 +175,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;
@@ -200,9 +200,9 @@ static int suspend_prepare(void)
-       pm_restore_console();
+       pm_restore_console();
        return error;
@@ -309,8 +309,8 @@ int suspend_devices_and_enter(suspend_state_t state)
 static void suspend_finish(void)
-       pm_restore_console();
+       pm_restore_console();
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to