diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2007-08-31 02:56:29 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-31 04:42:22 -0400 |
| commit | f3de4be9d5f8551d7880a1f1f5231a30e0161b1f (patch) | |
| tree | 9ebd397e6b253d144460f061b95ded60a7b0da0b /kernel/cpu.c | |
| parent | b07e35f94a7b6a059f889b904529ee907dc0634d (diff) | |
PM: Fix dependencies of CONFIG_SUSPEND and CONFIG_HIBERNATION
Dependencies of CONFIG_SUSPEND and CONFIG_HIBERNATION introduced by commit
296699de6bdc717189a331ab6bbe90e05c94db06 "Introduce CONFIG_SUSPEND for
suspend-to-Ram and standby" are incorrect, as they don't cover the facts that
(1) not all architectures support suspend and (2) SMP hibernation is only
possible on X86 and PPC64 (if CONFIG_PPC64_SWSUSP is set).
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/cpu.c')
| -rw-r--r-- | kernel/cpu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/cpu.c b/kernel/cpu.c index 181ae7086029..38033db8d8ec 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c | |||
| @@ -273,7 +273,7 @@ int __cpuinit cpu_up(unsigned int cpu) | |||
| 273 | return err; | 273 | return err; |
| 274 | } | 274 | } |
| 275 | 275 | ||
| 276 | #ifdef CONFIG_SUSPEND_SMP | 276 | #ifdef CONFIG_PM_SLEEP_SMP |
| 277 | static cpumask_t frozen_cpus; | 277 | static cpumask_t frozen_cpus; |
| 278 | 278 | ||
| 279 | int disable_nonboot_cpus(void) | 279 | int disable_nonboot_cpus(void) |
| @@ -334,4 +334,4 @@ void enable_nonboot_cpus(void) | |||
| 334 | out: | 334 | out: |
| 335 | mutex_unlock(&cpu_add_remove_lock); | 335 | mutex_unlock(&cpu_add_remove_lock); |
| 336 | } | 336 | } |
| 337 | #endif | 337 | #endif /* CONFIG_PM_SLEEP_SMP */ |