Index: src/libcfa/concurrency/kernel
===================================================================
--- src/libcfa/concurrency/kernel	(revision 025278e0ea194f101c7166809d5a4ee702acadaa)
+++ src/libcfa/concurrency/kernel	(revision 0fe4e6265f263a0fedaac815f2ed782fe74dabdd)
@@ -26,18 +26,18 @@
 //-----------------------------------------------------------------------------
 // Locks
-// Lock the spinlock, spin if already acquired
-void lock      ( spinlock * DEBUG_CTX_PARAM2 );
+// // 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, 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 );
+// // Lock the spinlock, return false if already acquired
+// bool try_lock  ( spinlock * DEBUG_CTX_PARAM2 );
 
-// Unlock the spinlock
-void unlock    ( spinlock * );
+// // Unlock the spinlock
+// void unlock    ( spinlock * );
 
 struct semaphore {
-	spinlock lock;
+	__spinlock_t lock;
 	int count;
 	__thread_queue_t waiting;
@@ -54,5 +54,5 @@
 struct cluster {
 	// Ready queue locks
-	spinlock ready_queue_lock;
+	__spinlock_t ready_queue_lock;
 
 	// Ready queue for threads
@@ -74,6 +74,6 @@
 	FinishOpCode action_code;
 	thread_desc * thrd;
-	spinlock * lock;
-	spinlock ** locks;
+	__spinlock_t * lock;
+	__spinlock_t ** locks;
 	unsigned short lock_count;
 	thread_desc ** thrds;