diff mbox series

[v2,2/3] powerpc: hard disable irqs in smp_send_stop loop

Message ID 20180401103615.15454-3-npiggin@gmail.com (mailing list archive)
State Accepted
Commit 855bfe0de1a05a01f89975ea8ba9f5521fb0f567
Headers show
Series stop secondaries for reboot/shutdown | expand

Commit Message

Nicholas Piggin April 1, 2018, 10:36 a.m. UTC 
The hard lockup watchdog can fire under local_irq_disable
on platforms with irq soft masking.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
 arch/powerpc/kernel/smp.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
diff mbox series

Patch

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)