]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ARM: shmobile: Use shmobile_smp_cpu_disable() on sh73a0
authorMagnus Damm <damm@opensource.se>
Wed, 7 Aug 2013 22:13:39 +0000 (07:13 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Sat, 21 Sep 2013 00:47:30 +0000 (17:47 -0700)
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>
arch/arm/mach-shmobile/smp-sh73a0.c

index 0baa24443793402b2313969e8a2bdb0ac81e0038..9a30a3fc7e7d862d069fdd3ee14f4bad40b0f571 100644 (file)
@@ -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