Merge branch 'clk-fixes' into clk-next

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-shmobile / platsmp.c

diff --git a/arch/arm/mach-shmobile/platsmp.c b/arch/arm/mach-shmobile/platsmp.c
index 3923e09e966d5031cab8aa82fb304305c284e9ce..b23378f3d7e1726b6f92b3cc8be0ba8264c838f7 100644 (file)
--- a/arch/arm/mach-shmobile/platsmp.c
+++ b/arch/arm/mach-shmobile/platsmp.c
@@ -31,8 +31,8 @@ void shmobile_smp_hook(unsigned int cpu, unsigned long fn, unsigned long arg)
 }
 
 #ifdef CONFIG_HOTPLUG_CPU
-int shmobile_smp_cpu_disable(unsigned int cpu)
+bool shmobile_smp_cpu_can_disable(unsigned int cpu)
 {
-       return 0; /* Hotplug of any CPU is supported */
+       return true; /* Hotplug of any CPU is supported */
 }
 #endif