diff options
| author | Li Shaohua <shaohua.li@intel.com> | 2005-06-25 17:55:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 19:24:32 -0400 |
| commit | 5a72e04df5470df0ec646029d31e5528167ab1a7 (patch) | |
| tree | 11be00c3ed3d8bad775e6eec44078c9f942537b9 /kernel/power/Makefile | |
| parent | fb69c3907ead36b9e9f41ea6f0d0e0ae10a38a47 (diff) | |
[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>
Diffstat (limited to 'kernel/power/Makefile')
| -rw-r--r-- | kernel/power/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/power/Makefile b/kernel/power/Makefile index fbdc634135a7..2f438d0eaa13 100644 --- a/kernel/power/Makefile +++ b/kernel/power/Makefile | |||
| @@ -3,9 +3,9 @@ ifeq ($(CONFIG_PM_DEBUG),y) | |||
| 3 | EXTRA_CFLAGS += -DDEBUG | 3 | EXTRA_CFLAGS += -DDEBUG |
| 4 | endif | 4 | endif |
| 5 | 5 | ||
| 6 | swsusp-smp-$(CONFIG_SMP) += smp.o | ||
| 7 | |||
| 8 | obj-y := main.o process.o console.o pm.o | 6 | obj-y := main.o process.o console.o pm.o |
| 9 | obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o $(swsusp-smp-y) disk.o | 7 | obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o disk.o |
| 8 | |||
| 9 | obj-$(CONFIG_SUSPEND_SMP) += smp.o | ||
| 10 | 10 | ||
| 11 | obj-$(CONFIG_MAGIC_SYSRQ) += poweroff.o | 11 | obj-$(CONFIG_MAGIC_SYSRQ) += poweroff.o |