diff --git a/kernel/panic.c b/kernel/panic.c
index 84595f3..c00b0a8 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -92,6 +92,14 @@
 	local_irq_disable();
 
 	/*
+	 * Disable local interrupts. This will prevent panic_smp_self_stop
+	 * from deadlocking the first cpu that invokes the panic, since
+	 * there is nothing to prevent an interrupt handler (that runs
+	 * after the panic_lock is acquired) from invoking panic again.
+	 */
+	local_irq_disable();
+
+	/*
 	 * It's possible to come here directly from a panic-assertion and
 	 * not have preempt disabled. Some functions called from here want
 	 * preempt to be disabled. No point enabling it later though...