aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile/platsmp.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-11-04 10:17:38 -0400
committerPaul Mundt <lethal@linux-sh.org>2011-11-04 10:17:38 -0400
commitab61a6857269989acc6796ffc44e2b4f11a193dc (patch)
treec73fc8b77abd9828a35d18218bf1672b86782b54 /arch/arm/mach-shmobile/platsmp.c
parentd63638440cfad75fb339fd1261bea0485c7c3ecc (diff)
parent8722c996d61948a57ada840350b0383f6879bcaa (diff)
Merge branch 'rmobile/kota2' into rmobile-latest
Diffstat (limited to 'arch/arm/mach-shmobile/platsmp.c')
-rw-r--r--arch/arm/mach-shmobile/platsmp.c10
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 @@
21#include <asm/mach-types.h> 21#include <asm/mach-types.h>
22#include <mach/common.h> 22#include <mach/common.h>
23 23
24#define is_sh73a0() (machine_is_ag5evm() || machine_is_kota2())
25
24static unsigned int __init shmobile_smp_get_core_count(void) 26static unsigned int __init shmobile_smp_get_core_count(void)
25{ 27{
26 if (machine_is_ag5evm()) 28 if (is_sh73a0())
27 return sh73a0_get_core_count(); 29 return sh73a0_get_core_count();
28 30
29 return 1; 31 return 1;
@@ -31,7 +33,7 @@ static unsigned int __init shmobile_smp_get_core_count(void)
31 33
32static void __init shmobile_smp_prepare_cpus(void) 34static void __init shmobile_smp_prepare_cpus(void)
33{ 35{
34 if (machine_is_ag5evm()) 36 if (is_sh73a0())
35 sh73a0_smp_prepare_cpus(); 37 sh73a0_smp_prepare_cpus();
36} 38}
37 39
@@ -39,13 +41,13 @@ void __cpuinit platform_secondary_init(unsigned int cpu)
39{ 41{
40 trace_hardirqs_off(); 42 trace_hardirqs_off();
41 43
42 if (machine_is_ag5evm()) 44 if (is_sh73a0())
43 sh73a0_secondary_init(cpu); 45 sh73a0_secondary_init(cpu);
44} 46}
45 47
46int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle) 48int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)
47{ 49{
48 if (machine_is_ag5evm()) 50 if (is_sh73a0())
49 return sh73a0_boot_secondary(cpu); 51 return sh73a0_boot_secondary(cpu);
50 52
51 return -ENOSYS; 53 return -ENOSYS;