Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6-omap-h63xx.git] / arch / um / os-Linux / aio.c

diff --git a/arch/um/os-Linux/aio.c b/arch/um/os-Linux/aio.c
index 4158118c4a56bd21eeb9699a6588f82860a7374c..57e3d46c989cf0ba4ec4546d6e613e969537be3e 100644 (file)
--- a/arch/um/os-Linux/aio.c
+++ b/arch/um/os-Linux/aio.c
@@ -12,6 +12,7 @@
 #include "aio.h"
 #include "init.h"
 #include "kern_constants.h"
+#include "kern_util.h"
 #include "os.h"
 #include "user.h"
 
@@ -141,7 +142,7 @@ static int do_not_aio(struct aio_thread_req *req)
        if (actual != req->offset)
                return -errno;
 
-       switch(req->type) {
+       switch (req->type) {
        case AIO_READ:
                n = read(req->io_fd, req->buf, req->len);
                break;
@@ -218,7 +219,7 @@ static int init_aio_24(void)
                goto out_close_pipe;
 
        err = run_helper_thread(not_aio_thread, NULL,
-                               CLONE_FILES | CLONE_VM | SIGCHLD, &aio_stack);
+                               CLONE_FILES | CLONE_VM, &aio_stack);
        if (err < 0)
                goto out_close_pipe;
 
@@ -254,7 +255,7 @@ static int init_aio_26(void)
        }
 
        err = run_helper_thread(aio_thread, NULL,
-                               CLONE_FILES | CLONE_VM | SIGCHLD, &aio_stack);
+                               CLONE_FILES | CLONE_VM, &aio_stack);
        if (err < 0)
                return err;