Index: src/libcfa/concurrency/kernel
===================================================================
--- src/libcfa/concurrency/kernel	(revision 4e6fb8e098f18742d8fbe318ca33b1e972b3f0c8)
+++ src/libcfa/concurrency/kernel	(revision 1c273d04b68cc57e237ec5bb3b198fd7b17ebde3)
@@ -28,6 +28,16 @@
 //-----------------------------------------------------------------------------
 // Locks
-bool try_lock( spinlock * );
-void lock( spinlock * );
+bool try_lock( spinlock *
+	#ifdef __CFA_DEBUG__
+		, const char * caller
+	#endif
+);
+
+void lock( spinlock *
+	#ifdef __CFA_DEBUG__
+		, const char * caller
+	#endif
+);
+
 void unlock( spinlock * );
 
@@ -78,6 +88,4 @@
 	struct processorCtx_t * runner;
 	cluster * cltr;
-	coroutine_desc * current_coroutine;
-	thread_desc * current_thread;
 	pthread_t kernel_thread;
 	
