Index: uspace/lib/c/generic/fibril_synch.c
===================================================================
--- uspace/lib/c/generic/fibril_synch.c	(revision 649efcd10c85afaeb282dd04ea32710ea1e24a4e)
+++ uspace/lib/c/generic/fibril_synch.c	(revision 55bd76cdfcb40d7b25063357b27a0b77e7b71022)
@@ -58,15 +58,4 @@
 }
 
-static bool check_for_deadlock(fibril_owner_info_t *oi)
-{
-	while (oi && oi->owned_by) {
-		if (oi->owned_by == (fibril_t *) fibril_get_id())
-			return true;
-		oi = oi->owned_by->waits_for;
-	}
-
-	return false;
-}
-
 static void print_deadlock(fibril_owner_info_t *oi)
 {
@@ -89,7 +78,18 @@
 		oi = oi->owned_by->waits_for;
 	}
-
-	abort();
-}
+}
+
+
+static void check_for_deadlock(fibril_owner_info_t *oi)
+{
+	while (oi && oi->owned_by) {
+		if (oi->owned_by == (fibril_t *) fibril_get_id()) {
+			print_deadlock(oi);
+			abort();
+		}
+		oi = oi->owned_by->waits_for;
+	}
+}
+
 
 void fibril_mutex_initialize(fibril_mutex_t *fm)
@@ -113,9 +113,6 @@
 		link_initialize(&wdata.wu_event.link);
 		list_append(&wdata.wu_event.link, &fm->waiters);
-
-		if (check_for_deadlock(&fm->oi))
-			print_deadlock(&fm->oi);
+		check_for_deadlock(&fm->oi);
 		f->waits_for = &fm->oi;
-
 		fibril_switch(FIBRIL_TO_MANAGER);
 	} else {
@@ -194,9 +191,6 @@
 		f->flags &= ~FIBRIL_WRITER;
 		list_append(&wdata.wu_event.link, &frw->waiters);
-		
-		if (check_for_deadlock(&frw->oi))
-			print_deadlock(&frw->oi);
+		check_for_deadlock(&frw->oi);
 		f->waits_for = &frw->oi;
-		
 		fibril_switch(FIBRIL_TO_MANAGER);
 	} else {
@@ -220,9 +214,6 @@
 		f->flags |= FIBRIL_WRITER;
 		list_append(&wdata.wu_event.link, &frw->waiters);
-		
-		if (check_for_deadlock(&frw->oi))
-			print_deadlock(&frw->oi);
+		check_for_deadlock(&frw->oi);
 		f->waits_for = &frw->oi;
-		
 		fibril_switch(FIBRIL_TO_MANAGER);
 	} else {