diff --git a/[refs] b/[refs]
index 568252f3d51a..f078d38551bf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c92ba6c327ee5089dec1e92eaa82927bee63d6d
+refs/heads/master: cb210ee3a81afab7c64777635cc18899a2bdd9a5
diff --git a/trunk/arch/tile/kernel/smp.c b/trunk/arch/tile/kernel/smp.c
index 7b6df8c27709..91da0f721958 100644
--- a/trunk/arch/tile/kernel/smp.c
+++ b/trunk/arch/tile/kernel/smp.c
@@ -113,6 +113,12 @@ void smp_send_stop(void)
 	send_IPI_allbutself(MSG_TAG_STOP_CPU);
 }
 
+/* On panic, just wait; we may get an smp_send_stop() later on. */
+void panic_smp_self_stop(void)
+{
+	while (1)
+		asm("nap; nop");
+}
 
 /*
  * Dispatch code called from hv_message_intr() for HV_MSG_TILE hv messages.