Index: src/libcfa/concurrency/kernel
===================================================================
--- src/libcfa/concurrency/kernel	(revision 1c273d04b68cc57e237ec5bb3b198fd7b17ebde3)
+++ src/libcfa/concurrency/kernel	(revision 7bbba7649454f6cfd175bc2eca517e4d75022e10)
@@ -28,17 +28,7 @@
 //-----------------------------------------------------------------------------
 // Locks
-bool try_lock( spinlock *
-	#ifdef __CFA_DEBUG__
-		, const char * caller
-	#endif
-);
-
-void lock( spinlock *
-	#ifdef __CFA_DEBUG__
-		, const char * caller
-	#endif
-);
-
-void unlock( spinlock * );
+bool try_lock( spinlock * DEBUG_CTX_PARAM2 );
+void lock    ( spinlock * DEBUG_CTX_PARAM2 );
+void unlock  ( spinlock * );
 
 struct signal_once {
@@ -78,5 +68,5 @@
 	unsigned short thrd_count;
 };
-static inline void ?{}(FinishAction * this) { 
+static inline void ?{}(FinishAction * this) {
 	this->action_code = No_Action;
 	this->thrd = NULL;
@@ -89,5 +79,5 @@
 	cluster * cltr;
 	pthread_t kernel_thread;
-	
+
 	signal_once terminated;
 	volatile bool is_terminated;