From: David Shaohua Li <shaohua.li@intel.com>
Date: Wed, 23 Nov 2005 17:36:00 +0000 (-0500)
Subject: [ACPI] SMP S3 resume: evaluate _WAK after INIT
X-Git-Tag: v2.6.16-rc2~1^2~8^2~1^2^8
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=1a38416cea8ac801ae8f261074721f35317613dc;p=safe%2Fjmp%2Flinux-2.6

[ACPI] SMP S3 resume: evaluate _WAK after INIT

On SMP resume from S3, we reset (INIT) the non-boot
processors to boot them cleanly.  But the BIOS needs
to execute _WAK after INIT in order to properly
initialized these processors upon resume.

http://bugzilla.kernel.org/show_bug.cgi?id=5651

Signed-off-by: David Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
---

diff --git a/kernel/power/main.c b/kernel/power/main.c
index d253f3a..9cb235c 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -133,10 +133,10 @@ static int suspend_enter(suspend_state_t state)
 static void suspend_finish(suspend_state_t state)
 {
 	device_resume();
-	if (pm_ops && pm_ops->finish)
-		pm_ops->finish(state);
 	thaw_processes();
 	enable_nonboot_cpus();
+	if (pm_ops && pm_ops->finish)
+		pm_ops->finish(state);
 	pm_restore_console();
 }