From: Randy Dunlap Date: Fri, 23 Sep 2005 04:43:56 +0000 (-0700) Subject: [PATCH] SOFTWARE_SUSPEND needs HOTPLUG_CPU on SMP X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=720b9429e8f41f7c4ee9df293403650905042035;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git [PATCH] SOFTWARE_SUSPEND needs HOTPLUG_CPU on SMP Signed-off-by: Randy Dunlap Acked-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig index 396c7873e804..46a5e5acff97 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.