Index: kernel/generic/src/synch/waitq.c
===================================================================
--- kernel/generic/src/synch/waitq.c	(revision 557394294b6545575e0e9b328455da8ae4cf8a51)
+++ kernel/generic/src/synch/waitq.c	(revision 547fa39619a466fb8274163c93478186568cd096)
@@ -87,4 +87,5 @@
 	waitq_t *wq;
 	bool do_wakeup = false;
+	DEADLOCK_PROBE_INIT(p_wqlock);
 
 	spinlock_lock(&threads_lock);
@@ -97,4 +98,5 @@
 		if (!spinlock_trylock(&wq->lock)) {
 			spinlock_unlock(&t->lock);
+			DEADLOCK_PROBE(p_wqlock, DEADLOCK_THRESHOLD);
 			goto grab_locks;	/* avoid deadlock */
 		}
@@ -129,4 +131,5 @@
 	bool do_wakeup = false;
 	ipl_t ipl;
+	DEADLOCK_PROBE_INIT(p_wqlock);
 
 	ipl = interrupts_disable();
@@ -148,4 +151,5 @@
 		if (!spinlock_trylock(&wq->lock)) {
 			spinlock_unlock(&t->lock);
+			DEADLOCK_PROBE(p_wqlock, DEADLOCK_THRESHOLD);
 			goto grab_locks;	/* avoid deadlock */
 		}