Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[linux-2.6-omap-h63xx.git] / arch / um / drivers / ubd_user.c

diff --git a/arch/um/drivers/ubd_user.c b/arch/um/drivers/ubd_user.c
index 4707b3f14c2fcf45029a0c4ae65d84bfad5004e8..41d254bd38df5222d06f6d08e643dda7469df524 100644 (file)
--- a/arch/um/drivers/ubd_user.c
+++ b/arch/um/drivers/ubd_user.c
@@ -43,6 +43,12 @@ int start_io_thread(unsigned long sp, int *fd_out)
        kernel_fd = fds[0];
        *fd_out = fds[1];
 
+       err = os_set_fd_block(*fd_out, 0);
+       if (err) {
+               printk("start_io_thread - failed to set nonblocking I/O.\n");
+               goto out_close;
+       }
+
        pid = clone(io_thread, (void *) sp, CLONE_FILES | CLONE_VM | SIGCHLD,
                    NULL);
        if(pid < 0){