diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-11-04 23:17:38 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-11-04 23:17:38 +0900 |
| commit | ab61a6857269989acc6796ffc44e2b4f11a193dc (patch) | |
| tree | c73fc8b77abd9828a35d18218bf1672b86782b54 /arch/arm/mach-shmobile/platsmp.c | |
| parent | d63638440cfad75fb339fd1261bea0485c7c3ecc (diff) | |
| parent | 8722c996d61948a57ada840350b0383f6879bcaa (diff) | |
| download | talos-obmc-linux-ab61a6857269989acc6796ffc44e2b4f11a193dc.tar.gz talos-obmc-linux-ab61a6857269989acc6796ffc44e2b4f11a193dc.zip | |
Merge branch 'rmobile/kota2' into rmobile-latest
Diffstat (limited to 'arch/arm/mach-shmobile/platsmp.c')
| -rw-r--r-- | arch/arm/mach-shmobile/platsmp.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/mach-shmobile/platsmp.c b/arch/arm/mach-shmobile/platsmp.c index e4e485fa2532..c49a833bf9bb 100644 --- a/arch/arm/mach-shmobile/platsmp.c +++ b/arch/arm/mach-shmobile/platsmp.c @@ -21,9 +21,11 @@ #include <asm/mach-types.h> #include <mach/common.h> +#define is_sh73a0() (machine_is_ag5evm() || machine_is_kota2()) + static unsigned int __init shmobile_smp_get_core_count(void) { - if (machine_is_ag5evm()) + if (is_sh73a0()) return sh73a0_get_core_count(); return 1; @@ -31,7 +33,7 @@ static unsigned int __init shmobile_smp_get_core_count(void) static void __init shmobile_smp_prepare_cpus(void) { - if (machine_is_ag5evm()) + if (is_sh73a0()) sh73a0_smp_prepare_cpus(); } @@ -39,13 +41,13 @@ void __cpuinit platform_secondary_init(unsigned int cpu) { trace_hardirqs_off(); - if (machine_is_ag5evm()) + if (is_sh73a0()) sh73a0_secondary_init(cpu); } int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle) { - if (machine_is_ag5evm()) + if (is_sh73a0()) return sh73a0_boot_secondary(cpu); return -ENOSYS; |
