Skip to content

Commit

Permalink
ARM: mach-shmobile: update for SMP changes.
Browse files Browse the repository at this point in the history
There have likewise been some API updates, so we refactor to use the
consolidated smp_prepare_cpus().

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Paul Mundt committed Jan 7, 2011
1 parent c0312b3 commit c413521
Showing 1 changed file with 3 additions and 18 deletions.
21 changes: 3 additions & 18 deletions arch/arm/mach-shmobile/platsmp.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
* SMP support for R-Mobile / SH-Mobile
*
* Copyright (C) 2010 Magnus Damm
* Copyright (C) 2011 Paul Mundt
*
* Based on vexpress, Copyright (C) 2002 ARM Ltd, All Rights Reserved
*
Expand Down Expand Up @@ -33,7 +34,6 @@ static void __init shmobile_smp_prepare_cpus(void)
sh73a0_smp_prepare_cpus();
}


void __cpuinit platform_secondary_init(unsigned int cpu)
{
trace_hardirqs_off();
Expand All @@ -59,27 +59,12 @@ void __init smp_init_cpus(void)
set_cpu_possible(i, true);
}

void __init smp_prepare_cpus(unsigned int max_cpus)
void __init platform_smp_prepare_cpus(unsigned int max_cpus)
{
unsigned int ncores = shmobile_smp_get_core_count();
unsigned int cpu = smp_processor_id();
int i;

smp_store_cpu_info(cpu);

if (max_cpus > ncores)
max_cpus = ncores;

for (i = 0; i < max_cpus; i++)
set_cpu_present(i, true);

if (max_cpus > 1) {
shmobile_smp_prepare_cpus();

/*
* Enable the local timer or broadcast device for the
* boot CPU, but only if we have more than one CPU.
*/
percpu_timer_setup();
}
shmobile_smp_prepare_cpus();
}

0 comments on commit c413521

Please sign in to comment.