cpumask: use set_cpu_active in init/main.c

cpu_active_map is deprecated in favor of cpu_active_mask, which is
const for safety: we use accessors now (set_cpu_active) is we really
want to make a change.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

2 files changed, 4 insertions, 5 deletions

diff --git a/init/main.c b/init/main.c
index 1ac7ec78e601..d6b388fbffa6 100644
--- a/init/main.c
+++ b/init/main.c
@@ -407,8 +407,7 @@ static void __init smp_init(void)
          * Set up the current CPU as possible to migrate to.
          * The other ones will be done by cpu_up/cpu_down()
          */
-        cpu = smp_processor_id();
-        cpu_set(cpu, cpu_active_map);
+        set_cpu_active(smp_processor_id(), true);
 
         /* FIXME: This should be done in userspace --RR */
         for_each_present_cpu(cpu) {
diff --git a/kernel/cpu.c b/kernel/cpu.c
index 79e40f00dcb8..395b6974dc8d 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -281,7 +281,7 @@ int __ref cpu_down(unsigned int cpu)
                 goto out;
         }
 
-        cpu_clear(cpu, cpu_active_map);
+        set_cpu_active(cpu, false);
 
         /*
          * Make sure the all cpus did the reschedule and are not
@@ -296,7 +296,7 @@ int __ref cpu_down(unsigned int cpu)
         err = _cpu_down(cpu, 0);
 
         if (cpu_online(cpu))
-                cpu_set(cpu, cpu_active_map);
+                set_cpu_active(cpu, true);
 
 out:
         cpu_maps_update_done();
@@ -333,7 +333,7 @@ static int __cpuinit _cpu_up(unsigned int cpu, int tasks_frozen)
                 goto out_notify;
         BUG_ON(!cpu_online(cpu));
 
-        cpu_set(cpu, cpu_active_map);
+        set_cpu_active(cpu, true);
 
         /* Now call notifier in preparation. */
         raw_notifier_call_chain(&cpu_chain, CPU_ONLINE | mod, hcpu);