Index: uspace/lib/libc/generic/devmap.c
===================================================================
--- uspace/lib/libc/generic/devmap.c	(revision b267ee6de7af507ae30fa5aec80610b61e8d5aa6)
+++ uspace/lib/libc/generic/devmap.c	(revision e77994dd536e7f1760df4ee55468b443167ed601)
@@ -100,4 +100,6 @@
 		return phone;
 	
+	async_serialize_start();
+	
 	ipc_call_t answer;
 	aid_t req = async_send_2(phone, DEVMAP_DRIVER_REGISTER, 0, 0, &answer);
@@ -107,4 +109,5 @@
 	if (retval != EOK) {
 		async_wait_for(req, NULL);
+		async_serialize_end();
 		return -1;
 	}
@@ -116,4 +119,6 @@
 	async_wait_for(req, &retval);
 	
+	async_serialize_end();
+	
 	return retval;
 }
@@ -132,4 +137,6 @@
 		return phone;
 	
+	async_serialize_start();
+	
 	ipc_call_t answer;
 	aid_t req = async_send_2(phone, DEVMAP_DEVICE_REGISTER, 0, 0,
@@ -140,8 +147,11 @@
 	if (retval != EOK) {
 		async_wait_for(req, NULL);
-		return retval;
-	}
-	
-	async_wait_for(req, &retval);
+		async_serialize_end();
+		return retval;
+	}
+	
+	async_wait_for(req, &retval);
+	
+	async_serialize_end();
 	
 	if (retval != EOK) {
@@ -164,4 +174,6 @@
 		return phone;
 	
+	async_serialize_start();
+	
 	ipc_call_t answer;
 	aid_t req = async_send_2(phone, DEVMAP_DEVICE_GET_HANDLE, flags, 0,
@@ -172,8 +184,11 @@
 	if (retval != EOK) {
 		async_wait_for(req, NULL);
-		return retval;
-	}
-	
-	async_wait_for(req, &retval);
+		async_serialize_end();
+		return retval;
+	}
+	
+	async_wait_for(req, &retval);
+	
+	async_serialize_end();
 	
 	if (retval != EOK) {
@@ -212,5 +227,5 @@
 	
 	ipcarg_t count;
-	int retval = ipc_call_sync_0_1(phone, DEVMAP_DEVICE_GET_COUNT, &count);
+	int retval = async_req_0_1(phone, DEVMAP_DEVICE_GET_COUNT, &count);
 	if (retval != EOK)
 		return 0;
@@ -226,4 +241,6 @@
 		return 0;
 	
+	async_serialize_start();
+	
 	ipc_call_t answer;
 	aid_t req = async_send_0(phone, DEVMAP_DEVICE_GET_DEVICES, &answer);
@@ -233,8 +250,11 @@
 	if (retval != EOK) {
 		async_wait_for(req, NULL);
-		return 0;
-	}
-	
-	async_wait_for(req, &retval);
+		async_serialize_end();
+		return 0;
+	}
+	
+	async_wait_for(req, &retval);
+	
+	async_serialize_end();
 	
 	if (retval != EOK)