| From 8d9ef994e3a0873b1051fcab3414b2927a9a5d41 Mon Sep 17 00:00:00 2001 |
| From: Magnus Damm <damm@opensource.se> |
| Date: Thu, 8 Aug 2013 07:13:39 +0900 |
| Subject: 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> |
| (cherry picked from commit a3b142a1a08af543473ae726e5d96a969c5b02b5) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/smp-sh73a0.c | 9 +-------- |
| 1 file changed, 1 insertion(+), 8 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/smp-sh73a0.c b/arch/arm/mach-shmobile/smp-sh73a0.c |
| index 8b3b9777056b..25ddffc96bcf 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) |
| shmobile_smp_scu_prepare_cpus(max_cpus); |
| } |
| |
| -#ifdef CONFIG_HOTPLUG_CPU |
| -static int sh73a0_cpu_disable(unsigned int cpu) |
| -{ |
| - return 0; /* CPU0 and CPU1 supported */ |
| -} |
| -#endif /* CONFIG_HOTPLUG_CPU */ |
| - |
| struct smp_operations sh73a0_smp_ops __initdata = { |
| .smp_prepare_cpus = sh73a0_smp_prepare_cpus, |
| .smp_boot_secondary = sh73a0_boot_secondary, |
| #ifdef CONFIG_HOTPLUG_CPU |
| - .cpu_disable = sh73a0_cpu_disable, |
| + .cpu_disable = shmobile_smp_cpu_disable, |
| .cpu_die = shmobile_smp_scu_cpu_die, |
| .cpu_kill = shmobile_smp_scu_cpu_kill, |
| #endif |
| -- |
| 1.8.5.rc3 |
| |
