[PATCH] uml: more EINTR protection

This adds retrying on EINTR to a couple more places.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/um/kernel/helper.c b/arch/um/kernel/helper.c
index 1f166e9a2b2bdd71dc3c27b3b41c65b84a854303..0e3d409d9b3f6771380374eaa61e99960c3e6ff7 100644 (file)
--- a/arch/um/kernel/helper.c
+++ b/arch/um/kernel/helper.c
@@ -132,7 +132,7 @@ int run_helper_thread(int (*proc)(void *), void *arg, unsigned int flags,
                return(-errno);
        }
        if(stack_out == NULL){
-               pid = waitpid(pid, &status, 0);
+               CATCH_EINTR(pid = waitpid(pid, &status, 0));
                if(pid < 0){
                        printk("run_helper_thread - wait failed, errno = %d\n",
                               errno);
@@ -151,7 +151,7 @@ int helper_wait(int pid, int block)
 {
        int ret;
 
-       ret = waitpid(pid, NULL, WNOHANG);
+       CATCH_EINTR(ret = waitpid(pid, NULL, WNOHANG));
        if(ret < 0){
                printk("helper_wait : waitpid failed, errno = %d\n", errno);
                return(-errno);