diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 09:43:54 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 09:43:54 -0400 |
| commit | b160292cc216a50fd0cd386b0bda2cd48352c73b (patch) | |
| tree | ef07cf98f91353ee4c9ec1e1ca7a2a5d9d4b538a /kernel/cpu.c | |
| parent | b37bde147890c8fea8369a5a4e230dabdea4ebfb (diff) | |
| parent | bbf25010f1a6b761914430f5fca081ec8c7accd1 (diff) | |
Merge Linux 2.6.23
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 */ |