From: Randy Dunlap <rdunlap@xenotime.net>
Date: Fri, 23 Sep 2005 04:43:56 +0000 (-0700)
Subject: [PATCH] SOFTWARE_SUSPEND needs HOTPLUG_CPU on SMP
X-Git-Tag: v2.6.14-rc3~51^2~57
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=720b9429e8f41f7c4ee9df293403650905042035;p=linux-2.6-omap-h63xx.git

[PATCH] SOFTWARE_SUSPEND needs HOTPLUG_CPU on SMP

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 396c7873e80..46a5e5acff9 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -29,7 +29,7 @@ config PM_DEBUG
 
 config SOFTWARE_SUSPEND
 	bool "Software Suspend"
-	depends on PM && SWAP && (X86 || ((FVR || PPC32) && !SMP))
+	depends on PM && SWAP && (X86 && (!SMP || SUSPEND_SMP)) || ((FVR || PPC32) && !SMP)
 	---help---
 	  Enable the possibility of suspending the machine.
 	  It doesn't need APM.