These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / arm / common / mcpm_platsmp.c

diff --git a/kernel/arch/arm/common/mcpm_platsmp.c b/kernel/arch/arm/common/mcpm_platsmp.c
index 92e54d7..2b25b60 100644 (file)
--- a/kernel/arch/arm/common/mcpm_platsmp.c
+++ b/kernel/arch/arm/common/mcpm_platsmp.c
@@ -65,14 +65,10 @@ static int mcpm_cpu_kill(unsigned int cpu)
        return !mcpm_wait_for_cpu_powerdown(pcpu, pcluster);
 }
 
-static int mcpm_cpu_disable(unsigned int cpu)
+static bool mcpm_cpu_can_disable(unsigned int cpu)
 {
-       /*
-        * We assume all CPUs may be shut down.
-        * This would be the hook to use for eventual Secure
-        * OS migration requests as described in the PSCI spec.
-        */
-       return 0;
+       /* We assume all CPUs may be shut down. */
+       return true;
 }
 
 static void mcpm_cpu_die(unsigned int cpu)
@@ -92,7 +88,7 @@ static struct smp_operations __initdata mcpm_smp_ops = {
        .smp_secondary_init     = mcpm_secondary_init,
 #ifdef CONFIG_HOTPLUG_CPU
        .cpu_kill               = mcpm_cpu_kill,
-       .cpu_disable            = mcpm_cpu_disable,
+       .cpu_can_disable        = mcpm_cpu_can_disable,
        .cpu_die                = mcpm_cpu_die,
 #endif
 };