Index: kernel/generic/src/udebug/udebug.c
===================================================================
--- kernel/generic/src/udebug/udebug.c	(revision 1871118c75a2375392bbb2054288202965beca01)
+++ kernel/generic/src/udebug/udebug.c	(revision 4bfb5a01e39428a8780576ab646b543a6a873151)
@@ -438,8 +438,8 @@
 				/*
 				 * thread's lock must not be held when calling
-				 * waitq_wakeup.
+				 * waitq_close.
 				 *
 				 */
-				waitq_wakeup(&thread->udebug.go_wq, WAKEUP_ALL);
+				waitq_close(&thread->udebug.go_wq);
 			}
 
Index: kernel/generic/src/udebug/udebug_ops.c
===================================================================
--- kernel/generic/src/udebug/udebug_ops.c	(revision 1871118c75a2375392bbb2054288202965beca01)
+++ kernel/generic/src/udebug/udebug_ops.c	(revision 4bfb5a01e39428a8780576ab646b543a6a873151)
@@ -276,5 +276,5 @@
 	 *
 	 */
-	waitq_wakeup(&thread->udebug.go_wq, WAKEUP_ALL);
+	waitq_wake_all(&thread->udebug.go_wq);
 
 	_thread_op_end(thread);