From: Len Brown <lenb@kernel.org>
To: linux-pm@lists.linux-foundation.org
Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org,
"Rafael J. Wysocki" <rjw@sisk.pl>,
Len Brown <len.brown@intel.com>
Subject: [PATCH 36/37] Hibernation: Invoke suspend notifications after console switch
Date: Thu, 31 Jan 2008 23:37:07 -0500 [thread overview]
Message-ID: <6c6e1163d2b4833bf448f02aaf26e12053957078.1201840183.git.len.brown@intel.com> (raw)
In-Reply-To: <1201840628-23136-1-git-send-email-lenb@kernel.org>
In-Reply-To: <edae89f5d1eb1fbe1cab74333db5a8e29776900e.1201840183.git.len.brown@intel.com>
From: Rafael J. Wysocki <rjw@sisk.pl>
Following the recent change in the suspend code path, switch consoles before
calling PM notifiers during hibernation.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>
---
kernel/power/disk.c | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index 53c22d9..d09da08 100644
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@ -458,20 +458,13 @@ static void power_down(void)
while(1);
}
-static void unprepare_processes(void)
-{
- thaw_processes();
- pm_restore_console();
-}
-
static int prepare_processes(void)
{
int error = 0;
- pm_prepare_console();
if (freeze_processes()) {
error = -EBUSY;
- unprepare_processes();
+ thaw_processes();
}
return error;
}
@@ -491,6 +484,7 @@ int hibernate(void)
goto Unlock;
}
+ pm_prepare_console();
error = pm_notifier_call_chain(PM_HIBERNATION_PREPARE);
if (error)
goto Exit;
@@ -530,11 +524,12 @@ int hibernate(void)
swsusp_free();
}
Thaw:
- unprepare_processes();
+ thaw_processes();
Finish:
free_basic_memory_bitmaps();
Exit:
pm_notifier_call_chain(PM_POST_HIBERNATION);
+ pm_restore_console();
atomic_inc(&snapshot_device_available);
Unlock:
mutex_unlock(&pm_mutex);
@@ -603,6 +598,7 @@ static int software_resume(void)
goto Unlock;
}
+ pm_prepare_console();
error = pm_notifier_call_chain(PM_RESTORE_PREPARE);
if (error)
goto Finish;
@@ -626,11 +622,12 @@ static int software_resume(void)
printk(KERN_ERR "PM: Restore failed, recovering.\n");
swsusp_free();
- unprepare_processes();
+ thaw_processes();
Done:
free_basic_memory_bitmaps();
Finish:
pm_notifier_call_chain(PM_POST_RESTORE);
+ pm_restore_console();
atomic_inc(&snapshot_device_available);
/* For success case, the suspend path will release the lock */
Unlock:
--
1.5.4.rc5.16.gc0279
next prev parent reply other threads:[~2008-02-01 4:54 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-01 4:36 suspend patches for 2.6.25-rc0 Len Brown
2008-02-01 4:36 ` [PATCH 01/37] Hibernation: Introduce SNAPSHOT_GET_IMAGE_SIZE ioctl Len Brown
2008-02-01 4:36 ` [PATCH 02/37] Hibernation: Rework platform support ioctls (rev. 2) Len Brown
2008-02-01 4:36 ` [PATCH 03/37] Hibernation: Mark SNAPSHOT_SET_SWAP_FILE ioctl as deprecated " Len Brown
2008-02-01 4:36 ` [PATCH 04/37] Hibernation: Correct definitions of some ioctls " Len Brown
2008-02-01 4:36 ` [PATCH 05/37] Hibernation: Introduce exportable suspend ioctls header " Len Brown
2008-02-01 4:36 ` [PATCH 06/37] ACPI: Fix mismerge in acpi_hibernation_finish Len Brown
2008-02-01 4:36 ` [PATCH 07/37] Hibernation: Move function prototypes to header Len Brown
2008-02-01 4:36 ` [PATCH 08/37] Hibernation: Add PM_RESTORE_PREPARE and PM_POST_RESTORE notifiers (rev. 2) Len Brown
2008-02-01 4:36 ` [PATCH 09/37] Suspend: Testing facility " Len Brown
2008-02-01 4:36 ` [PATCH 10/37] suspend: build fix responding to 2.6.25 kset change Len Brown
2008-02-01 4:36 ` [PATCH 11/37] Hibernation: New testing facility (rev. 2) Len Brown
2008-02-01 4:36 ` [PATCH 12/37] PM: Suspend/hibernation debug documentation update " Len Brown
2008-02-01 4:36 ` [PATCH 13/37] PM: Make PM_TRACE more architecture independent Len Brown
2008-02-01 4:36 ` [PATCH 14/37] PM: Convert PM notifiers to out-of-line code Len Brown
2008-02-01 4:36 ` [PATCH 15/37] Suspend: Fix compilation warning for CONFIG_SUSPEND unset Len Brown
2008-02-01 4:36 ` [PATCH 16/37] Hibernation: Move low level resume to disk.c Len Brown
2008-02-01 4:36 ` [PATCH 17/37] Suspend: Fix comment in main.c Len Brown
2008-02-01 4:36 ` [PATCH 18/37] Hibernation: Fix comment in disk.c Len Brown
2008-02-01 4:36 ` [PATCH 19/37] Hibernation: Remove unnecessary variable declaration Len Brown
2008-02-01 4:36 ` [PATCH 20/37] Suspend: Use common prefix in messages Len Brown
2008-02-01 4:36 ` [PATCH 21/37] Hibernation: Update messages Len Brown
2008-02-01 4:36 ` [PATCH 22/37] Hibernation: Clean up Kconfig (V2) Len Brown
2008-02-01 4:36 ` [PATCH 23/37] Suspend: " Len Brown
2008-02-01 9:05 ` Bryan Wu
2008-02-04 14:59 ` Pavel Machek
2008-02-01 4:36 ` [PATCH 24/37] ACPI: clear GPE earily in resume to avoid warning Len Brown
2008-02-01 4:36 ` [PATCH 25/37] suspend: fix ia64 allmodconfig build Len Brown
2008-02-01 4:36 ` [PATCH 26/37] Suspend: Introduce begin() and end() callbacks Len Brown
2008-02-01 4:36 ` [PATCH 27/37] ACPI: Separate invocations of _GTS and _BFS from _PTS and _WAK Len Brown
2008-02-01 4:36 ` [PATCH 28/37] ACPI: Separate disabling of GPEs from _PTS Len Brown
2008-02-01 4:37 ` [PATCH 29/37] ACPI suspend: Call _PTS before suspending devices Len Brown
2008-02-01 4:37 ` [PATCH 30/37] Hibernation: Introduce begin() and end() callbacks Len Brown
2008-02-01 4:37 ` [PATCH 31/37] ACPI hibernation: Call _PTS before suspending devices Len Brown
2008-02-01 4:37 ` [PATCH 32/37] ACPI: Print message before calling _PTS Len Brown
2008-02-01 4:37 ` [PATCH 33/37] Suspend: Add config option to disable the freezer if architecture wants that Len Brown
2008-02-01 4:37 ` [PATCH 34/37] Suspend: Clean up suspend_64.c Len Brown
2008-02-01 4:37 ` [PATCH 35/37] Suspend: Invoke suspend notifications after console switch Len Brown
2008-02-01 4:37 ` Len Brown [this message]
2008-02-01 4:37 ` [PATCH 37/37] PM: Remove obsolete /sys/devices/.../power/state docs Len Brown
2008-02-01 5:48 ` [PATCH] feature-removal: Document suspend/hibernate deprecations Harvey Harrison
2008-02-01 10:54 ` Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6c6e1163d2b4833bf448f02aaf26e12053957078.1201840183.git.len.brown@intel.com \
--to=lenb@kernel.org \
--cc=len.brown@intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@lists.linux-foundation.org \
--cc=rjw@sisk.pl \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®