Index: generic/src/synch/waitq.c
===================================================================
--- generic/src/synch/waitq.c	(revision 203f4c3aea8429f12d8190c6d45de70bfc8f4e7b)
+++ generic/src/synch/waitq.c	(revision a597e3f03d1d6dfa29bde4a7c7dfb4a1b2ecc0e6)
@@ -74,5 +74,5 @@
 
 	spinlock_lock(&threads_lock);
-	if (!list_member(&t->threads_link, &threads_head))
+	if (!thread_exists(t))
 		goto out;
 
@@ -118,5 +118,5 @@
 	ipl = interrupts_disable();
 	spinlock_lock(&threads_lock);
-	if (!list_member(&t->threads_link, &threads_head))
+	if (!thread_exists(t))
 		goto out;