Browse Source

[ARM] smp: use new cpumask functions

Convert cpu_*_mask bit twiddling to the new set_cpu_*() API.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Russell King 16 years ago
parent
commit
e03cdade0c
3 changed files with 6 additions and 6 deletions
  1. 1 1
      arch/arm/include/asm/smp.h
  2. 3 3
      arch/arm/kernel/smp.c
  3. 2 2
      arch/arm/mach-realview/platsmp.c

+ 1 - 1
arch/arm/include/asm/smp.h

@@ -41,7 +41,7 @@ extern void show_ipi_list(struct seq_file *p);
 asmlinkage void do_IPI(struct pt_regs *regs);
 asmlinkage void do_IPI(struct pt_regs *regs);
 
 
 /*
 /*
- * Setup the SMP cpu_possible_map
+ * Setup the set of possible CPUs (via set_cpu_possible)
  */
  */
 extern void smp_init_cpus(void);
 extern void smp_init_cpus(void);
 
 

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

@@ -166,7 +166,7 @@ int __cpuexit __cpu_disable(void)
 	 * Take this CPU offline.  Once we clear this, we can't return,
 	 * Take this CPU offline.  Once we clear this, we can't return,
 	 * and we must not schedule until we're ready to give up the cpu.
 	 * and we must not schedule until we're ready to give up the cpu.
 	 */
 	 */
-	cpu_clear(cpu, cpu_online_map);
+	set_cpu_online(cpu, false);
 
 
 	/*
 	/*
 	 * OK - migrate IRQs away from this CPU
 	 * OK - migrate IRQs away from this CPU
@@ -288,7 +288,7 @@ asmlinkage void __cpuinit secondary_start_kernel(void)
 	/*
 	/*
 	 * OK, now it's safe to let the boot CPU continue
 	 * OK, now it's safe to let the boot CPU continue
 	 */
 	 */
-	cpu_set(cpu, cpu_online_map);
+	set_cpu_online(cpu, true);
 
 
 	/*
 	/*
 	 * OK, it's off to the idle thread for us
 	 * OK, it's off to the idle thread for us
@@ -462,7 +462,7 @@ static void ipi_cpu_stop(unsigned int cpu)
 	dump_stack();
 	dump_stack();
 	spin_unlock(&stop_lock);
 	spin_unlock(&stop_lock);
 
 
-	cpu_clear(cpu, cpu_online_map);
+	set_cpu_online(cpu, false);
 
 
 	local_fiq_disable();
 	local_fiq_disable();
 	local_irq_disable();
 	local_irq_disable();

+ 2 - 2
arch/arm/mach-realview/platsmp.c

@@ -166,7 +166,7 @@ void __init smp_init_cpus(void)
 	unsigned int i, ncores = get_core_count();
 	unsigned int i, ncores = get_core_count();
 
 
 	for (i = 0; i < ncores; i++)
 	for (i = 0; i < ncores; i++)
-		cpu_set(i, cpu_possible_map);
+		set_cpu_possible(i, true);
 }
 }
 
 
 void __init smp_prepare_cpus(unsigned int max_cpus)
 void __init smp_prepare_cpus(unsigned int max_cpus)
@@ -204,7 +204,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
 	 * actually populated at the present time.
 	 * actually populated at the present time.
 	 */
 	 */
 	for (i = 0; i < max_cpus; i++)
 	for (i = 0; i < max_cpus; i++)
-		cpu_set(i, cpu_present_map);
+		set_cpu_present(i, true);
 
 
 	/*
 	/*
 	 * Initialise the SCU if there are more than one CPU and let
 	 * Initialise the SCU if there are more than one CPU and let