diff options
| author | Nicholas Piggin | 2018-04-01 12:36:14 +0200 |
|---|---|---|
| committer | Michael Ellerman | 2018-04-03 14:59:10 +0200 |
| commit | 855bfe0de1a05a01f89975ea8ba9f5521fb0f567 (patch) | |
| tree | 1dbe76664e4945c922419befafb8f60c7b69207e /arch/powerpc/kernel/smp.c | |
| parent | powerpc: use NMI IPI for smp_send_stop (diff) | |
| download | kernel-qcow2-linux-855bfe0de1a05a01f89975ea8ba9f5521fb0f567.tar.gz kernel-qcow2-linux-855bfe0de1a05a01f89975ea8ba9f5521fb0f567.tar.xz kernel-qcow2-linux-855bfe0de1a05a01f89975ea8ba9f5521fb0f567.zip | |
powerpc: hard disable irqs in smp_send_stop loop
The hard lockup watchdog can fire under local_irq_disable
on platforms with irq soft masking.
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/kernel/smp.c')
| -rw-r--r-- | arch/powerpc/kernel/smp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c index db88660bf6bd..e16ec7b3b427 100644 --- a/arch/powerpc/kernel/smp.c +++ b/arch/powerpc/kernel/smp.c @@ -574,9 +574,10 @@ static void stop_this_cpu(void *dummy) /* Remove this CPU */ set_cpu_online(smp_processor_id(), false); - local_irq_disable(); + hard_irq_disable(); + spin_begin(); while (1) - ; + spin_cpu_relax(); } void smp_send_stop(void) |