diff --git a/[refs] b/[refs]
index 100d30943d00..ae664e87b57a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6ea4cceed18edebe1eb6001cb9e0f88cd741a6c
+refs/heads/master: 8603ec81487a5fefbc29611ff0d635b33b6da990
diff --git a/trunk/arch/um/os-Linux/aio.c b/trunk/arch/um/os-Linux/aio.c
index 5d258eb4f506..9bf944f6a1db 100644
--- a/trunk/arch/um/os-Linux/aio.c
+++ b/trunk/arch/um/os-Linux/aio.c
@@ -221,6 +221,11 @@ static int init_aio_24(void)
 
 	aio_req_fd_w = fds[0];
 	aio_req_fd_r = fds[1];
+
+	err = os_set_fd_block(aio_req_fd_w, 0);
+	if(err)
+		goto out_close_pipe;
+
 	err = run_helper_thread(not_aio_thread, NULL,
 				CLONE_FILES | CLONE_VM | SIGCHLD, &stack, 0);
 	if(err < 0)