diff options
author | Will Deacon <will.deacon@arm.com> | 2011-06-06 10:49:23 -0400 |
---|---|---|
committer | Will Deacon <will.deacon@arm.com> | 2011-12-12 11:07:35 -0500 |
commit | 02b73e2e9c288cbbb6ec96bef628cf08e29824c4 (patch) | |
tree | 0cf7662397eee9f2f2059c5bef8fedbdacad360a /arch/arm/kernel | |
parent | 290130a17718c1451bb8a77a5e2510e0279bd5f3 (diff) |
ARM: stop: execute platform callback from cpu_stop code
Sending IPI_CPU_STOP to a CPU causes it to execute a busy cpu_relax
loop forever. This makes it impossible to kexec successfully on an SMP
system since the secondary CPUs do not reset.
This patch adds a callback to platform_cpu_kill, defined when
CONFIG_HOTPLUG_CPU=y, from the ipi_cpu_stop handling code. This function
currently just returns 1 on all platforms that define it but allows them
to do something more sophisticated in the future.
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm/kernel')
-rw-r--r-- | arch/arm/kernel/smp.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c index 76ff28d87bf3..57db122a4f62 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c | |||
@@ -522,6 +522,10 @@ static void ipi_cpu_stop(unsigned int cpu) | |||
522 | local_fiq_disable(); | 522 | local_fiq_disable(); |
523 | local_irq_disable(); | 523 | local_irq_disable(); |
524 | 524 | ||
525 | #ifdef CONFIG_HOTPLUG_CPU | ||
526 | platform_cpu_kill(cpu); | ||
527 | #endif | ||
528 | |||
525 | while (1) | 529 | while (1) |
526 | cpu_relax(); | 530 | cpu_relax(); |
527 | } | 531 | } |