commit 5a72e04df5470df0ec646029d31e5528167ab1a7
author Li Shaohua <shaohua.li@intel.com> Sat Jun 25 14:55:06 2005 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat Jun 25 16:24:32 2005 -0700
tree 11be00c3ed3d8bad775e6eec44078c9f942537b9
parent fb69c3907ead36b9e9f41ea6f0d0e0ae10a38a47

[PATCH] suspend/resume SMP support

Using CPU hotplug to support suspend/resume SMP.  Both S3 and S4 use
disable/enable_nonboot_cpus API.  The S4 part is based on Pavel's original S4
SMP patch.

Signed-off-by: Li Shaohua<shaohua.li@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

kernel/power/Makefile

diff --git a/kernel/power/Makefile b/kernel/power/Makefile
index fbdc634..2f438d0 100644
--- a/kernel/power/Makefile
+++ b/kernel/power/Makefile
@@ -3,9 +3,9 @@
 EXTRA_CFLAGS	+=	-DDEBUG
 endif
 
-swsusp-smp-$(CONFIG_SMP)	+= smp.o
-
 obj-y				:= main.o process.o console.o pm.o
-obj-$(CONFIG_SOFTWARE_SUSPEND)	+= swsusp.o $(swsusp-smp-y) disk.o
+obj-$(CONFIG_SOFTWARE_SUSPEND)	+= swsusp.o disk.o
+
+obj-$(CONFIG_SUSPEND_SMP)	+= smp.o
 
 obj-$(CONFIG_MAGIC_SYSRQ)	+= poweroff.o