Index: libc/generic/async.c
===================================================================
--- libc/generic/async.c	(revision bf9afa074efbd8c197ed9e69b254042671b05ce9)
+++ libc/generic/async.c	(revision 2d220493ac725b48f86226bb7502aabc5447cf2d)
@@ -508,5 +508,5 @@
 		futex_up(&async_futex);
 
-		callid = ipc_wait_cycle(&call, timeout, SYNCH_BLOCKING);
+		callid = ipc_wait_cycle(&call, timeout, SYNCH_FLAGS_NONE);
 
 		if (!callid) {
Index: libc/generic/futex.c
===================================================================
--- libc/generic/futex.c	(revision bf9afa074efbd8c197ed9e69b254042671b05ce9)
+++ libc/generic/futex.c	(revision 2d220493ac725b48f86226bb7502aabc5447cf2d)
@@ -82,10 +82,10 @@
 int futex_down(atomic_t *futex)
 {
-	return futex_down_timeout(futex, SYNCH_NO_TIMEOUT, SYNCH_BLOCKING);
+	return futex_down_timeout(futex, SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NONE);
 }
 
 int futex_trydown(atomic_t *futex)
 {
-	return futex_down_timeout(futex, SYNCH_NO_TIMEOUT, SYNCH_NON_BLOCKING);
+	return futex_down_timeout(futex, SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NON_BLOCKING);
 }
 
@@ -94,5 +94,5 @@
  * @param futex Futex.
  * @param usec Microseconds to wait. Zero value means sleep without timeout.
- * @param trydown If usec is zero and trydown is non-zero, only conditional
+ * @param flags Select mode of operation. See comment for waitq_sleep_timeout(). 
  *
  * @return ENOENT if there is no such virtual address. One of ESYNCH_OK_ATOMIC
@@ -101,10 +101,10 @@
  *	   operation could not be carried out atomically (if requested so).
  */
-int futex_down_timeout(atomic_t *futex, uint32_t usec, int trydown)
+int futex_down_timeout(atomic_t *futex, uint32_t usec, int flags)
 {
 	int rc;
 	
 	while (atomic_predec(futex) < 0) {
-		rc = __SYSCALL3(SYS_FUTEX_SLEEP, (sysarg_t) &futex->count, (sysarg_t) usec, (sysarg_t) trydown);
+		rc = __SYSCALL3(SYS_FUTEX_SLEEP, (sysarg_t) &futex->count, (sysarg_t) usec, (sysarg_t) flags);
 		
 		switch (rc) {
Index: libc/generic/ipc.c
===================================================================
--- libc/generic/ipc.c	(revision bf9afa074efbd8c197ed9e69b254042671b05ce9)
+++ libc/generic/ipc.c	(revision 2d220493ac725b48f86226bb7502aabc5447cf2d)
@@ -361,5 +361,5 @@
 
 	do {
-		callid = ipc_wait_cycle(call, usec, SYNCH_BLOCKING);
+		callid = ipc_wait_cycle(call, usec, SYNCH_FLAGS_NONE);
 	} while (callid & IPC_CALLID_ANSWERED);
 
@@ -378,5 +378,5 @@
 
 	do {
-		callid = ipc_wait_cycle(call, SYNCH_NO_TIMEOUT, SYNCH_NON_BLOCKING);
+		callid = ipc_wait_cycle(call, SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NON_BLOCKING);
 	} while (callid & IPC_CALLID_ANSWERED);
 
Index: libc/include/futex.h
===================================================================
--- libc/include/futex.h	(revision bf9afa074efbd8c197ed9e69b254042671b05ce9)
+++ libc/include/futex.h	(revision 2d220493ac725b48f86226bb7502aabc5447cf2d)
@@ -38,5 +38,5 @@
 extern int futex_down(atomic_t *futex);
 extern int futex_trydown(atomic_t *futex);
-extern int futex_down_timeout(atomic_t *futex, uint32_t usec, int trydown);
+extern int futex_down_timeout(atomic_t *futex, uint32_t usec, int flags);
 extern int futex_up(atomic_t *futex);