Index: kernel/generic/src/synch/waitq.c
===================================================================
--- kernel/generic/src/synch/waitq.c	(revision b1696194837e19c7e4d446880d20ede25043bad4)
+++ kernel/generic/src/synch/waitq.c	(revision 62e3411966e54f06eb6dd3adfd33b1aaae4bfc8a)
@@ -70,7 +70,5 @@
 void waitq_initialize(waitq_t *wq)
 {
-	memsetb(wq, sizeof(*wq), 0);
-	irq_spinlock_initialize(&wq->lock, "wq.lock");
-	list_initialize(&wq->sleepers);
+	*wq = WAITQ_INITIALIZER(*wq);
 }
 
@@ -81,6 +79,5 @@
 void waitq_initialize_with_count(waitq_t *wq, int count)
 {
-	waitq_initialize(wq);
-	wq->wakeup_balance = count;
+	*wq = WAITQ_INITIALIZER_WITH_COUNT(*wq, count);
 }