Index: src/libcfa/concurrency/kernel
===================================================================
--- src/libcfa/concurrency/kernel	(revision ea7d2b051267e571f113e8dabae0d886eda94432)
+++ src/libcfa/concurrency/kernel	(revision 0cf5b7992194658ccc6f30eae5069589577633a3)
@@ -26,20 +26,8 @@
 //-----------------------------------------------------------------------------
 // Locks
-// // Lock the spinlock, spin if already acquired
-// void lock      ( spinlock * DEBUG_CTX_PARAM2 );
-
-// // Lock the spinlock, yield repeatedly if already acquired
-// void lock_yield( spinlock * DEBUG_CTX_PARAM2 );
-
-// // Lock the spinlock, return false if already acquired
-// bool try_lock  ( spinlock * DEBUG_CTX_PARAM2 );
-
-// // Unlock the spinlock
-// void unlock    ( spinlock * );
-
 struct semaphore {
 	__spinlock_t lock;
 	int count;
-	__thread_queue_t waiting;
+	__queue_t(thread_desc) waiting;
 };
 
@@ -57,5 +45,5 @@
 
 	// Ready queue for threads
-	__thread_queue_t ready_queue;
+	__queue_t(thread_desc) ready_queue;
 
 	// Preemption rate on this cluster