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.
Unified · Split
| @@ -407,8 +407,7 @@ static void __init smp_init(void) · 406 unmodified lines | |||
| 407 | * Set up the current CPU as possible to migrate to. | 407 | * Set up the current CPU as possible to migrate to. |
| 408 | * The other ones will be done by cpu_up/cpu_down() | 408 | * The other ones will be done by cpu_up/cpu_down() |
| 409 | */ | 409 | */ |
| 410 | cpu = smp_processor_id(); | 410 | set_cpu_active(smp_processor_id(), true); |
| 411 | cpu_set(cpu, cpu_active_map); | ||
| 412 | 411 | ||
| 413 | /* FIXME: This should be done in userspace --RR */ | 412 | /* FIXME: This should be done in userspace --RR */ |
| 414 | for_each_present_cpu(cpu) { | 413 | for_each_present_cpu(cpu) { |
| @@ -281,7 +281,7 @@ int __ref cpu_down(unsigned int cpu) · 280 unmodified lines | |||
| 281 | goto out; | 281 | goto out; |
| 282 | } | 282 | } |
| 283 | 283 | ||
| 284 | cpu_clear(cpu, cpu_active_map); | 284 | set_cpu_active(cpu, false); |
| 285 | 285 | ||
| 286 | /* | 286 | /* |
| 287 | * Make sure the all cpus did the reschedule and are not | 287 | * Make sure the all cpus did the reschedule and are not |
| @@ -296,7 +296,7 @@ int __ref cpu_down(unsigned int cpu) · 8 unmodified lines | |||
| 296 | err = _cpu_down(cpu, 0); | 296 | err = _cpu_down(cpu, 0); |
| 297 | 297 | ||
| 298 | if (cpu_online(cpu)) | 298 | if (cpu_online(cpu)) |
| 299 | cpu_set(cpu, cpu_active_map); | 299 | set_cpu_active(cpu, true); |
| 300 | 300 | ||
| 301 | out: | 301 | out: |
| 302 | cpu_maps_update_done(); | 302 | cpu_maps_update_done(); |
| @@ -333,7 +333,7 @@ static int __cpuinit _cpu_up(unsigned int cpu, int tasks_frozen) · 30 unmodified lines | |||
| 333 | goto out_notify; | 333 | goto out_notify; |
| 334 | BUG_ON(!cpu_online(cpu)); | 334 | BUG_ON(!cpu_online(cpu)); |
| 335 | 335 | ||
| 336 | cpu_set(cpu, cpu_active_map); | 336 | set_cpu_active(cpu, true); |
| 337 | 337 | ||
| 338 | /* Now call notifier in preparation. */ | 338 | /* Now call notifier in preparation. */ |
| 339 | raw_notifier_call_chain(&cpu_chain, CPU_ONLINE | mod, hcpu); | 339 | raw_notifier_call_chain(&cpu_chain, CPU_ONLINE | mod, hcpu); |