update to 2.6.9-rc1

[linux-flexiantxendom0-3.2.10.git] / arch / um / kernel / skas / exec_user.c

diff --git a/arch/um/kernel/skas/exec_user.c b/arch/um/kernel/skas/exec_user.c
index d50633a..c9942b6 100644 (file)
--- a/arch/um/kernel/skas/exec_user.c
+++ b/arch/um/kernel/skas/exec_user.c
@@ -11,7 +11,6 @@
 #include <sys/ptrace.h>
 #include "user.h"
 #include "kern_util.h"
-#include "user_util.h"
 #include "os.h"
 #include "time_user.h"
 
@@ -27,7 +26,7 @@ static int user_thread_tramp(void *arg)
 
 int user_thread(unsigned long stack, int flags)
 {
-       int pid, status, err;
+       int pid, status;
 
        pid = clone(user_thread_tramp, (void *) stack_sp(stack), 
                    flags | CLONE_FILES | SIGCHLD, NULL);
@@ -36,8 +35,7 @@ int user_thread(unsigned long stack, int flags)
                return(pid);
        }
 
-       CATCH_EINTR(err = waitpid(pid, &status, WUNTRACED));
-       if(err < 0){
+       if(waitpid(pid, &status, WUNTRACED) < 0){
                printk("user_thread - waitpid failed, errno = %d\n", errno);
                return(-errno);
        }