AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

ARM: mach-shmobile: update for SMP changes.

Browse Source 
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>
This commit is contained in:
Paul Mundt 2011-01-07 12:03:22 +09:00
parent c0312b33da
commit c413521eb4
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
arch/arm/mach-shmobile/platsmp.c
View File

@ -2,6 +2,7 @@
* SMP support for R-Mobile / SH-Mobile * SMP support for R-Mobile / SH-Mobile
* *
* Copyright (C) 2010 Magnus Damm * Copyright (C) 2010 Magnus Damm
* Copyright (C) 2011 Paul Mundt
* *
* Based on vexpress, Copyright (C) 2002 ARM Ltd, All Rights Reserved * Based on vexpress, Copyright (C) 2002 ARM Ltd, All Rights Reserved
* *
@ -33,7 +34,6 @@ static void __init shmobile_smp_prepare_cpus(void)
sh73a0_smp_prepare_cpus(); sh73a0_smp_prepare_cpus();
} }
void __cpuinit platform_secondary_init(unsigned int cpu) void __cpuinit platform_secondary_init(unsigned int cpu)
{ {
trace_hardirqs_off(); trace_hardirqs_off();
@ -59,27 +59,12 @@ void __init smp_init_cpus(void)
set_cpu_possible(i, true); 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; int i;
smp_store_cpu_info(cpu);
if (max_cpus > ncores)
max_cpus = ncores;
for (i = 0; i < max_cpus; i++) for (i = 0; i < max_cpus; i++)
set_cpu_present(i, true); set_cpu_present(i, true);
if (max_cpus > 1) { shmobile_smp_prepare_cpus();
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();
}
} }