Merge branch 'pm-sleep'

[linux-2.6-block.git] / kernel / cpu.c

diff --git a/kernel/cpu.c b/kernel/cpu.c
index 76deba01322acae787dac032c4466c5fab8f313a..759feaaa9bb0704bd1ff44e072db25c78e4c5922 100644 (file)
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -731,10 +731,12 @@ void set_cpu_present(unsigned int cpu, bool present)
 
 void set_cpu_online(unsigned int cpu, bool online)
 {
-       if (online)
+       if (online) {
                cpumask_set_cpu(cpu, to_cpumask(cpu_online_bits));
-       else
+               cpumask_set_cpu(cpu, to_cpumask(cpu_active_bits));
+       } else {
                cpumask_clear_cpu(cpu, to_cpumask(cpu_online_bits));
+       }
 }
 
 void set_cpu_active(unsigned int cpu, bool active)