From: Russell King Date: Sat, 11 Jan 2014 11:25:37 +0000 (+0000) Subject: ARM: SMP implementations are not supposed to return from smp_ops.cpu_die() X-Git-Tag: v3.14-rc1~116^2~1^5 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=668bc38669f9a6d5e91846e9435b22b196cee9d1;p=karo-tx-linux.git ARM: SMP implementations are not supposed to return from smp_ops.cpu_die() Although we allow recovery in this case, this is not supposed to be the normal path for hotplugging a CPU back in. This path only exists to serve those rare platforms where it's not possible to power down the CPU or reset the CPU. This patch causes the kernel to print a message when a platform uses this path. Signed-off-by: Russell King --- diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c index 8c61325b8bfc..b7b4c86e338b 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c @@ -293,6 +293,9 @@ void __ref cpu_die(void) if (smp_ops.cpu_die) smp_ops.cpu_die(cpu); + pr_warn("CPU%u: smp_ops.cpu_die() returned, trying to resuscitate\n", + cpu); + /* * Do not return to the idle loop - jump back to the secondary * cpu initialisation. There's some initialisation which needs