diff --git a/[refs] b/[refs]
index 093e95985aa8..fff54d7d9ea4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0964ce24d091a1d3dc7f667e1b107ab77d4325e6
+refs/heads/master: b188ffe876382ecc009ceb4fe033fd6ec7ba4ede
diff --git a/trunk/arch/mips/kernel/gdb-stub.c b/trunk/arch/mips/kernel/gdb-stub.c
index d3fd1ab14274..7c46b336c7db 100644
--- a/trunk/arch/mips/kernel/gdb-stub.c
+++ b/trunk/arch/mips/kernel/gdb-stub.c
@@ -637,15 +637,18 @@ static struct gdb_bp_save async_bp;
  * and only one can be active at a time.
  */
 extern spinlock_t smp_call_lock;
+
 void set_async_breakpoint(unsigned long *epc)
 {
 	/* skip breaking into userland */
 	if ((*epc & 0x80000000) == 0)
 		return;
 
+#ifdef CONFIG_SMP
 	/* avoid deadlock if someone is make IPC */
 	if (spin_is_locked(&smp_call_lock))
 		return;
+#endif
 
 	async_bp.addr = *epc;
 	*epc = (unsigned long)async_breakpoint;