diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2007-08-30 23:56:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-31 01:42:22 -0700 |
| commit | f3de4be9d5f8551d7880a1f1f5231a30e0161b1f (patch) | |
| tree | 9ebd397e6b253d144460f061b95ded60a7b0da0b /include/linux/cpu.h | |
| parent | b07e35f94a7b6a059f889b904529ee907dc0634d (diff) | |
| download | op-kernel-dev-f3de4be9d5f8551d7880a1f1f5231a30e0161b1f.zip op-kernel-dev-f3de4be9d5f8551d7880a1f1f5231a30e0161b1f.tar.gz | |
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 'include/linux/cpu.h')
| -rw-r--r-- | include/linux/cpu.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/cpu.h b/include/linux/cpu.h index 1d5ded0..0ad72c4 100644 --- a/include/linux/cpu.h +++ b/include/linux/cpu.h @@ -126,16 +126,16 @@ static inline void cpuhotplug_mutex_unlock(struct mutex *cpu_hp_mutex) static inline int cpu_is_offline(int cpu) { return 0; } #endif /* CONFIG_HOTPLUG_CPU */ -#ifdef CONFIG_SUSPEND_SMP +#ifdef CONFIG_PM_SLEEP_SMP extern int suspend_cpu_hotplug; extern int disable_nonboot_cpus(void); extern void enable_nonboot_cpus(void); -#else +#else /* !CONFIG_PM_SLEEP_SMP */ #define suspend_cpu_hotplug 0 static inline int disable_nonboot_cpus(void) { return 0; } static inline void enable_nonboot_cpus(void) {} -#endif +#endif /* !CONFIG_PM_SLEEP_SMP */ #endif /* _LINUX_CPU_H_ */ |
