diff options
Diffstat (limited to 'arch/arm/mach-shmobile/smp-sh73a0.c')
-rw-r--r-- | arch/arm/mach-shmobile/smp-sh73a0.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/arch/arm/mach-shmobile/smp-sh73a0.c b/arch/arm/mach-shmobile/smp-sh73a0.c index 0baa24443793..13ba36a6831f 100644 --- a/arch/arm/mach-shmobile/smp-sh73a0.c +++ b/arch/arm/mach-shmobile/smp-sh73a0.c | |||
@@ -46,11 +46,6 @@ void __init sh73a0_register_twd(void) | |||
46 | static int sh73a0_boot_secondary(unsigned int cpu, struct task_struct *idle) | 46 | static int sh73a0_boot_secondary(unsigned int cpu, struct task_struct *idle) |
47 | { | 47 | { |
48 | unsigned int lcpu = cpu_logical_map(cpu); | 48 | unsigned int lcpu = cpu_logical_map(cpu); |
49 | int ret; | ||
50 | |||
51 | ret = shmobile_smp_scu_boot_secondary(cpu, idle); | ||
52 | if (ret) | ||
53 | return ret; | ||
54 | 49 | ||
55 | if (((__raw_readl(PSTR) >> (4 * lcpu)) & 3) == 3) | 50 | if (((__raw_readl(PSTR) >> (4 * lcpu)) & 3) == 3) |
56 | __raw_writel(1 << lcpu, WUPCR); /* wake up */ | 51 | __raw_writel(1 << lcpu, WUPCR); /* wake up */ |
@@ -71,18 +66,11 @@ static void __init sh73a0_smp_prepare_cpus(unsigned int max_cpus) | |||
71 | shmobile_smp_scu_prepare_cpus(max_cpus); | 66 | shmobile_smp_scu_prepare_cpus(max_cpus); |
72 | } | 67 | } |
73 | 68 | ||
74 | #ifdef CONFIG_HOTPLUG_CPU | ||
75 | static int sh73a0_cpu_disable(unsigned int cpu) | ||
76 | { | ||
77 | return 0; /* CPU0 and CPU1 supported */ | ||
78 | } | ||
79 | #endif /* CONFIG_HOTPLUG_CPU */ | ||
80 | |||
81 | struct smp_operations sh73a0_smp_ops __initdata = { | 69 | struct smp_operations sh73a0_smp_ops __initdata = { |
82 | .smp_prepare_cpus = sh73a0_smp_prepare_cpus, | 70 | .smp_prepare_cpus = sh73a0_smp_prepare_cpus, |
83 | .smp_boot_secondary = sh73a0_boot_secondary, | 71 | .smp_boot_secondary = sh73a0_boot_secondary, |
84 | #ifdef CONFIG_HOTPLUG_CPU | 72 | #ifdef CONFIG_HOTPLUG_CPU |
85 | .cpu_disable = sh73a0_cpu_disable, | 73 | .cpu_disable = shmobile_smp_cpu_disable, |
86 | .cpu_die = shmobile_smp_scu_cpu_die, | 74 | .cpu_die = shmobile_smp_scu_cpu_die, |
87 | .cpu_kill = shmobile_smp_scu_cpu_kill, | 75 | .cpu_kill = shmobile_smp_scu_cpu_kill, |
88 | #endif | 76 | #endif |