Index: kernel/generic/src/ipc/kbox.c
===================================================================
--- kernel/generic/src/ipc/kbox.c	(revision c6f0e3a2d4056ec77f60764b9555ecdaf24c62d6)
+++ kernel/generic/src/ipc/kbox.c	(revision b10e6e31d0f332626f6e576a32b9d212b7751e01)
@@ -47,5 +47,4 @@
 void ipc_kbox_cleanup(void)
 {
-	ipl_t ipl;
 	bool have_kb_thread;
 
@@ -78,10 +77,8 @@
 	 * kbox thread to clean it up since sender != debugger.
 	 */
-	ipl = interrupts_disable();
-	spinlock_lock(&TASK->lock);
+	mutex_lock(&TASK->udebug.lock);
 	udebug_task_cleanup(TASK);
-	spinlock_unlock(&TASK->lock);
-	interrupts_restore(ipl);
-	
+	mutex_unlock(&TASK->udebug.lock);
+
 	if (have_kb_thread) {
 		LOG("Join kb.thread.");