cpumask: use set_cpu_active in init/main.c
PATCH 4/10 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 <[email protected]>
--- init/main.c | 3 +-- kernel/cpu.c | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-)
init/main.c +1 -2
@@ -401,8 +401,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) {
kernel/cpu.c +3 -3
@@ -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 in 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);