Commit e09377ba authored by Rusty Russell's avatar Rusty Russell Committed by Paul Mundt

cpumask: Use accessors for cpu_*_mask: sh

Use the accessors rather than frobbing bits directly (the new versions
are const).
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarMike Travis <travis@sgi.com>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 74c86d67
...@@ -35,8 +35,7 @@ void __init plat_smp_setup(void) ...@@ -35,8 +35,7 @@ void __init plat_smp_setup(void)
unsigned int cpu = 0; unsigned int cpu = 0;
int i, num; int i, num;
cpus_clear(cpu_possible_map); init_cpu_possible(cpumask_of(cpu));
cpu_set(cpu, cpu_possible_map);
__cpu_number_map[0] = 0; __cpu_number_map[0] = 0;
__cpu_logical_map[0] = 0; __cpu_logical_map[0] = 0;
...@@ -46,7 +45,7 @@ void __init plat_smp_setup(void) ...@@ -46,7 +45,7 @@ void __init plat_smp_setup(void)
* for the total number of cores. * for the total number of cores.
*/ */
for (i = 1, num = 0; i < NR_CPUS; i++) { for (i = 1, num = 0; i < NR_CPUS; i++) {
cpu_set(i, cpu_possible_map); set_cpu_possible(i, true);
__cpu_number_map[i] = ++num; __cpu_number_map[i] = ++num;
__cpu_logical_map[num] = i; __cpu_logical_map[num] = i;
} }
......
...@@ -47,7 +47,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus) ...@@ -47,7 +47,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
plat_prepare_cpus(max_cpus); plat_prepare_cpus(max_cpus);
#ifndef CONFIG_HOTPLUG_CPU #ifndef CONFIG_HOTPLUG_CPU
cpu_present_map = cpu_possible_map; init_cpu_present(&cpu_possible_map);
#endif #endif
} }
...@@ -58,8 +58,8 @@ void __devinit smp_prepare_boot_cpu(void) ...@@ -58,8 +58,8 @@ void __devinit smp_prepare_boot_cpu(void)
__cpu_number_map[0] = cpu; __cpu_number_map[0] = cpu;
__cpu_logical_map[0] = cpu; __cpu_logical_map[0] = cpu;
cpu_set(cpu, cpu_online_map); set_cpu_online(cpu, true);
cpu_set(cpu, cpu_possible_map); set_cpu_possible(cpu, true);
} }
asmlinkage void __cpuinit start_secondary(void) asmlinkage void __cpuinit start_secondary(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment