Explorar o código

cpumask: Use accessors for cpu_*_mask: sh

Use the accessors rather than frobbing bits directly (the new versions
are const).

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Mike Travis <travis@sgi.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Rusty Russell %!s(int64=16) %!d(string=hai) anos
pai
achega
e09377bae4
Modificáronse 2 ficheiros con 5 adicións e 6 borrados
  1. 2 3
      arch/sh/kernel/cpu/sh4a/smp-shx3.c
  2. 3 3
      arch/sh/kernel/smp.c

+ 2 - 3
arch/sh/kernel/cpu/sh4a/smp-shx3.c

@@ -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);
-	cpu_set(cpu, cpu_possible_map);
+	init_cpu_possible(cpumask_of(cpu));
 
 
 	__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)
 	 * 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;
 	}
 	}

+ 3 - 3
arch/sh/kernel/smp.c

@@ -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)
 	__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);
-	cpu_set(cpu, cpu_possible_map);
+	set_cpu_online(cpu, true);
+	set_cpu_possible(cpu, true);
 }
 }
 
 
 asmlinkage void __cpuinit start_secondary(void)
 asmlinkage void __cpuinit start_secondary(void)