Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e03cdade authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] smp: use new cpumask functions 



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

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent af73110d

arch/arm/include/asm/smp.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ extern void show_ipi_list(struct seq_file *p); 
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);

arch/arm/kernel/smp.c

+3 −3
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ int __cpuexit __cpu_disable(void) 
	 * 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.

	 */

	cpu_clear(cpu, cpu_online_map);

	set_cpu_online(cpu, false);



	/*

	 * 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

	 */

	cpu_set(cpu, cpu_online_map);

	set_cpu_online(cpu, true);



	/*

	 * OK, it's off to the idle thread for us
@@ -462,7 +462,7 @@ static void ipi_cpu_stop(unsigned int cpu) 
	dump_stack();

	spin_unlock(&stop_lock);



	cpu_clear(cpu, cpu_online_map);

	set_cpu_online(cpu, false);



	local_fiq_disable();

	local_irq_disable();

arch/arm/mach-realview/platsmp.c

+2 −2
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ void __init smp_init_cpus(void) 
	unsigned int i, ncores = get_core_count();



	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)
@@ -204,7 +204,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus) 
	 * actually populated at the present time.

	 */

	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