Skip to content

Commit

Permalink
[ARM] smp: use new cpumask functions
Browse files Browse the repository at this point in the history
Convert cpu_*_mask bit twiddling to the new set_cpu_*() API.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Russell King authored and Russell King committed May 28, 2009
1 parent af73110 commit e03cdad
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion arch/arm/include/asm/smp.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
6 changes: 3 additions & 3 deletions arch/arm/kernel/smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-realview/platsmp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit e03cdad

Please sign in to comment.