diff options
author | Magnus Damm <damm@opensource.se> | 2013-08-07 18:13:39 -0400 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2013-09-20 20:47:30 -0400 |
commit | a3b142a1a08af543473ae726e5d96a969c5b02b5 (patch) | |
tree | c39c381df67358f81733b75765bbd1ec4d31c3bd | |
parent | 5c4dfcd663b6e96cc20f02dc2c7c315749ea1bc1 (diff) |
ARM: shmobile: Use shmobile_smp_cpu_disable() on sh73a0
Use shmobile_smp_cpu_disable() on sh73a0 since it
allows CPU Hotplug of any CPU.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
-rw-r--r-- | arch/arm/mach-shmobile/smp-sh73a0.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/arm/mach-shmobile/smp-sh73a0.c b/arch/arm/mach-shmobile/smp-sh73a0.c index 0baa24443793..9a30a3fc7e7d 100644 --- a/arch/arm/mach-shmobile/smp-sh73a0.c +++ b/arch/arm/mach-shmobile/smp-sh73a0.c | |||
@@ -71,18 +71,11 @@ static void __init sh73a0_smp_prepare_cpus(unsigned int max_cpus) | |||
71 | shmobile_smp_scu_prepare_cpus(max_cpus); | 71 | shmobile_smp_scu_prepare_cpus(max_cpus); |
72 | } | 72 | } |
73 | 73 | ||
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 = { | 74 | struct smp_operations sh73a0_smp_ops __initdata = { |
82 | .smp_prepare_cpus = sh73a0_smp_prepare_cpus, | 75 | .smp_prepare_cpus = sh73a0_smp_prepare_cpus, |
83 | .smp_boot_secondary = sh73a0_boot_secondary, | 76 | .smp_boot_secondary = sh73a0_boot_secondary, |
84 | #ifdef CONFIG_HOTPLUG_CPU | 77 | #ifdef CONFIG_HOTPLUG_CPU |
85 | .cpu_disable = sh73a0_cpu_disable, | 78 | .cpu_disable = shmobile_smp_cpu_disable, |
86 | .cpu_die = shmobile_smp_scu_cpu_die, | 79 | .cpu_die = shmobile_smp_scu_cpu_die, |
87 | .cpu_kill = shmobile_smp_scu_cpu_kill, | 80 | .cpu_kill = shmobile_smp_scu_cpu_kill, |
88 | #endif | 81 | #endif |