Merge branch 'arm64/psci-rework' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / arch / arm64 / kernel / smp.c

diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
index 65f1a7f..4b2121b 100644 (file)
--- a/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@ -249,7 +249,7 @@ static int op_cpu_kill(unsigned int cpu)
         * time and hope that it's dead, so let's skip the wait and just hope.
         */
        if (!cpu_ops[cpu]->cpu_kill)
-               return 1;
+               return 0;
 
        return cpu_ops[cpu]->cpu_kill(cpu);
 }
@@ -260,6 +260,8 @@ static int op_cpu_kill(unsigned int cpu)
  */
 void __cpu_die(unsigned int cpu)
 {
+       int err;
+
        if (!cpu_wait_death(cpu, 5)) {
                pr_crit("CPU%u: cpu didn't die\n", cpu);
                return;
@@ -272,8 +274,10 @@ void __cpu_die(unsigned int cpu)
         * verify that it has really left the kernel before we consider
         * clobbering anything it might still be using.
         */
-       if (!op_cpu_kill(cpu))
-               pr_warn("CPU%d may not have shut down cleanly\n", cpu);
+       err = op_cpu_kill(cpu);
+       if (err)
+               pr_warn("CPU%d may not have shut down cleanly: %d\n",
+                       cpu, err);
 }
 
 /*