diff options
| author | Randy Dunlap <rdunlap@xenotime.net> | 2005-09-23 00:43:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-23 01:17:34 -0400 |
| commit | 720b9429e8f41f7c4ee9df293403650905042035 (patch) | |
| tree | b9ad4fecd9cfeec716fd0a7746c6adaf12616ac5 /kernel/power | |
| parent | 244bc050d5c9431682b7d834aff92e663fe88bb2 (diff) | |
[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>
Diffstat (limited to 'kernel/power')
| -rw-r--r-- | kernel/power/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
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 | |||
| 29 | 29 | ||
| 30 | config SOFTWARE_SUSPEND | 30 | config SOFTWARE_SUSPEND |
| 31 | bool "Software Suspend" | 31 | bool "Software Suspend" |
| 32 | depends on PM && SWAP && (X86 || ((FVR || PPC32) && !SMP)) | 32 | depends on PM && SWAP && (X86 && (!SMP || SUSPEND_SMP)) || ((FVR || PPC32) && !SMP) |
| 33 | ---help--- | 33 | ---help--- |
| 34 | Enable the possibility of suspending the machine. | 34 | Enable the possibility of suspending the machine. |
| 35 | It doesn't need APM. | 35 | It doesn't need APM. |